aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorMilan Bouchet-Valat <nalimilan@club.fr>2010-10-02 00:05:38 +0800
committerMilan Bouchet-Valat <nalimilan@club.fr>2010-10-04 22:42:28 +0800
commita9fc19b195dd0f2c7117dad3a00606afafe3544b (patch)
tree12e61069824079520d8c0ac9e08af478792ae302 /widgets
parent5bde5537b6d098b16f96e46f48fdf45a3ce92207 (diff)
downloadgsoc2013-evolution-a9fc19b195dd0f2c7117dad3a00606afafe3544b.tar
gsoc2013-evolution-a9fc19b195dd0f2c7117dad3a00606afafe3544b.tar.gz
gsoc2013-evolution-a9fc19b195dd0f2c7117dad3a00606afafe3544b.tar.bz2
gsoc2013-evolution-a9fc19b195dd0f2c7117dad3a00606afafe3544b.tar.lz
gsoc2013-evolution-a9fc19b195dd0f2c7117dad3a00606afafe3544b.tar.xz
gsoc2013-evolution-a9fc19b195dd0f2c7117dad3a00606afafe3544b.tar.zst
gsoc2013-evolution-a9fc19b195dd0f2c7117dad3a00606afafe3544b.zip
Get rid of deprecated GtkObject in EMap widget
Remove GtkObject::destroy() handler. Move disconnecting signal handlers to e_map_finalize(). https://bugzilla.gnome.org/show_bug.cgi?id=630766
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/e-map.c26
1 files changed, 2 insertions, 24 deletions
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 9167e85a86..b56efa171a 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -83,7 +83,6 @@ struct _EMapPrivate {
/* Internal prototypes */
static void e_map_finalize (GObject *object);
-static void e_map_destroy (GtkObject *object);
static void e_map_realize (GtkWidget *widget);
static void e_map_size_request (GtkWidget *widget, GtkRequisition *requisition);
static void e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
@@ -122,17 +121,13 @@ static void
e_map_class_init (EMapClass *class)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
gobject_class = (GObjectClass *) class;
- object_class = (GtkObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
gobject_class->finalize = e_map_finalize;
- object_class->destroy = e_map_destroy;
-
class->set_scroll_adjustments = e_map_set_scroll_adjustments;
widget_class->set_scroll_adjustments_signal = g_signal_new ("set_scroll_adjustments",
G_OBJECT_CLASS_TYPE (gobject_class),
@@ -179,10 +174,10 @@ e_map_init (EMap *view)
gtk_widget_set_has_window (widget, TRUE);
}
-/* Destroy handler for the map view */
+/* Finalize handler for the map view */
static void
-e_map_destroy (GtkObject *object)
+e_map_finalize (GObject *object)
{
EMap *view;
EMapPrivate *priv;
@@ -196,23 +191,6 @@ e_map_destroy (GtkObject *object)
g_signal_handlers_disconnect_by_func (priv->hadj, adjustment_changed_cb, view);
g_signal_handlers_disconnect_by_func (priv->vadj, adjustment_changed_cb, view);
- GTK_OBJECT_CLASS (e_map_parent_class)->destroy (object);
-}
-
-/* Finalize handler for the map view */
-
-static void
-e_map_finalize (GObject *object)
-{
- EMap *view;
- EMapPrivate *priv;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (E_IS_MAP (object));
-
- view = E_MAP (object);
- priv = view->priv;
-
g_object_unref ((priv->hadj));
priv->hadj = NULL;