diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/groupwise-features/junk-settings.c | 15 | ||||
| -rw-r--r-- | plugins/groupwise-features/share-folder.c | 15 | ||||
| -rw-r--r-- | plugins/itip-formatter/itip-view.c | 11 |
3 files changed, 22 insertions, 19 deletions
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 242d037bb4..4ec4159ab6 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -41,7 +41,7 @@ typedef struct _JunkEntry JunkEntry; static void junk_settings_class_init (JunkSettingsClass *class); static void junk_settings_init (JunkSettings *js); -static void junk_settings_destroy (GtkObject *obj); +static void junk_settings_dispose (GObject *obj); static void junk_settings_finalise (GObject *obj); static void free_all (JunkSettings *js); static void get_junk_list (JunkSettings *js); @@ -75,12 +75,11 @@ junk_settings_get_type (void) static void junk_settings_class_init (JunkSettingsClass *klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); parent_class = g_type_class_ref (gtk_vbox_get_type ()); - object_class->destroy = junk_settings_destroy; - gobject_class->finalize = junk_settings_finalise; + object_class->dispose = junk_settings_dispose; + object_class->finalize = junk_settings_finalise; } static void @@ -94,11 +93,13 @@ junk_settings_finalise (GObject *obj) } static void -junk_settings_destroy (GtkObject *obj) +junk_settings_dispose (GObject *obj) { JunkSettings *js = (JunkSettings *) obj; free_all (js); - GTK_OBJECT_CLASS (parent_class)->destroy (obj); + + if (G_OBJECT_CLASS (parent_class)->dispose) + G_OBJECT_CLASS (parent_class)->dispose (obj); } static void diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index d7c564cbfe..765232d915 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -43,7 +43,7 @@ typedef struct _SharedUser SharedUser; static void share_folder_class_init (ShareFolderClass *class); static void share_folder_init (ShareFolder *sf); -static void share_folder_destroy (GtkObject *obj); +static void share_folder_dispose (GObject *obj); static void share_folder_finalise (GObject *obj); static void free_user_node (EShUsers *user); static void free_node (SharedUser *user); @@ -87,12 +87,11 @@ share_folder_get_type (void) static void share_folder_class_init (ShareFolderClass *klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); parent_class = g_type_class_ref (gtk_vbox_get_type ()); - object_class->destroy = share_folder_destroy; - gobject_class->finalize = share_folder_finalise; + object_class->dispose = share_folder_dispose; + object_class->finalize = share_folder_finalise; } static void @@ -105,12 +104,14 @@ share_folder_finalise (GObject *obj) } static void -share_folder_destroy (GtkObject *obj) +share_folder_dispose (GObject *obj) { ShareFolder *sf = (ShareFolder *) obj; free_all (sf); - GTK_OBJECT_CLASS (parent_class)->destroy (obj); + + if (G_OBJECT_CLASS (parent_class)->dispose) + G_OBJECT_CLASS (parent_class)->dispose (obj); } static void diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 9cc641e4ee..4a2925196f 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -888,7 +888,7 @@ set_buttons (ItipView *view) } static void -itip_view_destroy (GtkObject *object) +itip_view_dispose (GObject *object) { ItipView *view = ITIP_VIEW (object); ItipViewPrivate *priv = view->priv; @@ -915,17 +915,18 @@ itip_view_destroy (GtkObject *object) view->priv = NULL; } - GTK_OBJECT_CLASS (itip_view_parent_class)->destroy (object); + if (G_OBJECT_CLASS (itip_view_parent_class)->dispose) + G_OBJECT_CLASS (itip_view_parent_class)->dispose (object); } static void itip_view_class_init (ItipViewClass *klass) { - GtkObjectClass *gtkobject_class; + GObjectClass *object_class; - gtkobject_class = GTK_OBJECT_CLASS (klass); + object_class = G_OBJECT_CLASS (klass); - gtkobject_class->destroy = itip_view_destroy; + object_class->dispose = itip_view_dispose; signals[SOURCE_SELECTED] = g_signal_new ("source_selected", |