From ede7fcb220b739c4d12775904086afe0df595acd Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sun, 3 Nov 2002 22:08:16 +0000 Subject: Changed all gtk_object_refs()/gtk_object_unrefs() into * *.c, *.h: Changed all gtk_object_refs()/gtk_object_unrefs() into g_object_refs()/g_object_unrefs() and all gtk_signal_connect_*() into g_signal_connect_*(). [Except for some case where we have gtk_signal_connect_full() or gtk_signal_connect_while_alive() calls that cannot be trivially ported to use the g_signal_* functions, we'll have to fix those later.] * e-splash.c (impl_finalize): Finalize implementation, copied over from impl_destroy. (impl_destroy): Removed. (class_init): Override finalize, not destroy. * e-activity-handler.c: Ported from GtkObject to GObject. * evolution-storage.c: Likewise. * e-corba-shortcuts.c: Likewise. * evolution-session.h: Likewise. * evolution-config-control.c: Likewise. * evolution-shell-component-dnd.c: Likewise. * evolution-shell-component.c: Likewise. * evolution-shell-view.c: Likewise. * evolution-storage-set-view.c: Likewise. * evolution-wizard.c: Likewise. svn path=/trunk/; revision=18513 --- shell/evolution-storage-set-view.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'shell/evolution-storage-set-view.c') diff --git a/shell/evolution-storage-set-view.c b/shell/evolution-storage-set-view.c index 551664ff3d..17ff341cb8 100644 --- a/shell/evolution-storage-set-view.c +++ b/shell/evolution-storage-set-view.c @@ -363,10 +363,10 @@ impl_StorageSetView__get_checkedFolders (PortableServer_Servant servant, } -/* GtkObject methods. */ +/* GObject methods. */ static void -impl_destroy (GtkObject *object) +impl_finalize (GObject *object) { EvolutionStorageSetView *storage_set_view; EvolutionStorageSetViewPrivate *priv; @@ -389,8 +389,7 @@ impl_destroy (GtkObject *object) g_free (priv); - if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -398,10 +397,10 @@ static void class_init (EvolutionStorageSetViewClass *klass) { POA_GNOME_Evolution_StorageSetView__epv *epv; - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = impl_destroy; + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = impl_finalize; epv = & (klass->epv); epv->addListener = impl_StorageSetView_add_listener; @@ -443,10 +442,10 @@ evolution_storage_set_view_construct (EvolutionStorageSetView *storage_set_view, g_assert (priv->storage_set_view_widget == NULL); priv->storage_set_view_widget = GTK_WIDGET (storage_set_view_widget); - gtk_signal_connect (GTK_OBJECT (priv->storage_set_view_widget), "folder_selected", - GTK_SIGNAL_FUNC (storage_set_view_widget_folder_selected_cb), storage_set_view); - gtk_signal_connect (GTK_OBJECT (priv->storage_set_view_widget), "checkboxes_changed", - GTK_SIGNAL_FUNC (storage_set_view_widget_folder_toggled_cb), storage_set_view); + g_signal_connect (priv->storage_set_view_widget, "folder_selected", + G_CALLBACK (storage_set_view_widget_folder_selected_cb), storage_set_view); + g_signal_connect (priv->storage_set_view_widget, "checkboxes_changed", + G_CALLBACK (storage_set_view_widget_folder_toggled_cb), storage_set_view); } EvolutionStorageSetView * -- cgit v1.2.3