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/e-shell-folder-creation-dialog.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'shell/e-shell-folder-creation-dialog.c') diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c index 7ee73563ec..a215fd8348 100644 --- a/shell/e-shell-folder-creation-dialog.c +++ b/shell/e-shell-folder-creation-dialog.c @@ -265,6 +265,7 @@ storage_set_view_folder_selected_cb (EStorageSetView *storage_set_view, /* Shell signal callbacks. */ +#if 0 static void shell_destroy_cb (GtkObject *object, void *data) @@ -274,6 +275,7 @@ shell_destroy_cb (GtkObject *object, dialog = GNOME_DIALOG (data); gtk_widget_destroy (GTK_WIDGET (dialog)); } +#endif /* Dialog setup. */ @@ -526,20 +528,22 @@ e_shell_show_folder_creation_dialog (EShell *shell, dialog_data->result_callback_data = result_callback_data; dialog_data->creation_in_progress = FALSE; - gtk_signal_connect (GTK_OBJECT (dialog), "clicked", - GTK_SIGNAL_FUNC (dialog_clicked_cb), dialog_data); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (dialog_destroy_cb), dialog_data); + g_signal_connect (dialog, "clicked", + G_CALLBACK (dialog_clicked_cb), dialog_data); + g_signal_connect (dialog, "destroy", + G_CALLBACK (dialog_destroy_cb), dialog_data); - gtk_signal_connect (GTK_OBJECT (dialog_data->folder_name_entry), "changed", - GTK_SIGNAL_FUNC (folder_name_entry_changed_cb), dialog_data); + g_signal_connect (dialog_data->folder_name_entry, "changed", + G_CALLBACK (folder_name_entry_changed_cb), dialog_data); - gtk_signal_connect (GTK_OBJECT (dialog_data->storage_set_view), "folder_selected", - GTK_SIGNAL_FUNC (storage_set_view_folder_selected_cb), dialog_data); + g_signal_connect (dialog_data->storage_set_view, "folder_selected", + G_CALLBACK (storage_set_view_folder_selected_cb), dialog_data); - gtk_signal_connect_while_alive (GTK_OBJECT (shell), "destroy", - GTK_SIGNAL_FUNC (shell_destroy_cb), dialog_data, - GTK_OBJECT (dialog)); +#if 0 /* FIXME */ + g_signal_connect_object (GTK_OBJECT (shell), "destroy", + G_CALLBACK (shell_destroy_cb), dialog_data, + GTK_OBJECT (dialog)); +#endif - gtk_object_unref (GTK_OBJECT (gui)); + g_object_unref (gui); } -- cgit v1.2.3