diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-04 06:08:16 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-04 06:08:16 +0800 |
| commit | ede7fcb220b739c4d12775904086afe0df595acd (patch) | |
| tree | cae8198cf8f57d3e08d13c03538e69a411f8a45c | |
| parent | 9cbba714fc0eb122c0736b94727b4d2580b9d53c (diff) | |
| download | gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.gz gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.zst gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.zip | |
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
46 files changed, 599 insertions, 601 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index e2e7cfda98..f7b1d4d735 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,30 @@ 2002-11-03 Ettore Perazzoli <ettore@ximian.com> + * *.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. + +2002-11-03 Ettore Perazzoli <ettore@ximian.com> + * e-component-info.c: Updated for libxml2. * e-shortcuts.c: Likewise. * e-folder-list.c: Likewise. diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c index efddecdb3c..e0002af2df 100644 --- a/shell/e-activity-handler.c +++ b/shell/e-activity-handler.c @@ -282,8 +282,9 @@ task_widget_new_from_activity_info (ActivityInfo *activity_info) activity_info->information); gtk_widget_show (widget); - gtk_signal_connect (GTK_OBJECT (widget), "button_press_event", - GTK_SIGNAL_FUNC (task_widget_button_press_event_callback), activity_info); + g_signal_connect (widget, "button_press_event", + G_CALLBACK (task_widget_button_press_event_callback), + activity_info); return E_TASK_WIDGET (widget); } @@ -323,10 +324,10 @@ task_bar_destroy_callback (GtkObject *task_bar_object, } -/* GtkObject methods. */ +/* GObject methods. */ static void -impl_destroy (GtkObject *object) +impl_finalize (GObject *object) { EActivityHandler *handler; EActivityHandlerPrivate *priv; @@ -345,7 +346,7 @@ impl_destroy (GtkObject *object) g_free (priv); handler->priv = NULL; - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -509,13 +510,13 @@ impl_requestDialog (PortableServer_Servant servant, /* GTK+ type stuff. */ static void -class_init (GtkObjectClass *object_class) +class_init (GObjectClass *object_class) { EActivityHandlerClass *handler_class; parent_class = gtk_type_class (PARENT_TYPE); - object_class->destroy = impl_destroy; + object_class->finalize = impl_finalize; handler_class = E_ACTIVITY_HANDLER_CLASS (object_class); handler_class->epv.operationStarted = impl_operationStarted; @@ -552,7 +553,7 @@ e_activity_handler_new (void) { EActivityHandler *activity_handler; - activity_handler = gtk_type_new (e_activity_handler_get_type ()); + activity_handler = g_object_new (e_activity_handler_get_type (), 0); e_activity_handler_construct (activity_handler); return activity_handler; @@ -572,9 +573,9 @@ e_activity_handler_attach_task_bar (EActivityHandler *activity_handler, priv = activity_handler->priv; - gtk_signal_connect_while_alive (GTK_OBJECT (task_bar), "destroy", - GTK_SIGNAL_FUNC (task_bar_destroy_callback), activity_handler, - GTK_OBJECT (activity_handler)); + g_signal_connect_object (task_bar, "destroy", + G_CALLBACK (task_bar_destroy_callback), + G_OBJECT (activity_handler), 0); priv->task_bars = g_slist_prepend (priv->task_bars, task_bar); diff --git a/shell/e-corba-shortcuts.c b/shell/e-corba-shortcuts.c index 06f68144d0..6412d9e69d 100644 --- a/shell/e-corba-shortcuts.c +++ b/shell/e-corba-shortcuts.c @@ -84,10 +84,10 @@ shortcut_list_to_corba (const GSList *shortcut_list, } -/* GtkObject methods. */ +/* GObject methods. */ static void -impl_destroy (GtkObject *object) +impl_finalize (GObject *object) { ECorbaShortcuts *corba_shortcuts; ECorbaShortcutsPrivate *priv; @@ -95,14 +95,16 @@ impl_destroy (GtkObject *object) corba_shortcuts = E_CORBA_SHORTCUTS (object); priv = corba_shortcuts->priv; - gtk_object_unref (GTK_OBJECT (priv->shortcuts)); + g_object_unref (priv->shortcuts); g_free (priv); - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } +/* Evolution::Shortcuts CORBA methods. */ + static void impl_add (PortableServer_Servant servant, const CORBA_short group_num, @@ -277,14 +279,14 @@ impl__get_groups (PortableServer_Servant servant, static void -class_init (GtkObjectClass *object_class) +class_init (GObjectClass *object_class) { ECorbaShortcutsClass *corba_shortcuts_class; POA_GNOME_Evolution_Shortcuts__epv *epv; parent_class = gtk_type_class (PARENT_TYPE); - object_class->destroy = impl_destroy; + object_class->finalize = impl_finalize; corba_shortcuts_class = E_CORBA_SHORTCUTS_CLASS (object_class); @@ -318,9 +320,9 @@ e_corba_shortcuts_new (EShortcuts *shortcuts) g_return_val_if_fail (shortcuts != NULL, NULL); g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL); - corba_shortcuts = gtk_type_new (e_corba_shortcuts_get_type ()); + corba_shortcuts = g_object_new (e_corba_shortcuts_get_type (), NULL); - gtk_object_ref (GTK_OBJECT (shortcuts)); + g_object_ref (shortcuts); corba_shortcuts->priv->shortcuts = shortcuts; return corba_shortcuts; diff --git a/shell/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c index a867e47a44..b7f69ef6fd 100644 --- a/shell/e-corba-storage-registry.c +++ b/shell/e-corba-storage-registry.c @@ -103,7 +103,7 @@ impl_StorageRegistry_addStorage (PortableServer_Servant servant, return CORBA_OBJECT_NIL; } - gtk_object_unref (GTK_OBJECT (storage)); + g_object_unref (storage); /* FIXME: if we remove a listener while looping through the list we can @@ -239,7 +239,7 @@ storage_set_foreach (EStorageSet *set, name = e_storage_get_name (E_STORAGE (p->data)); listener_notify (listener, GNOME_Evolution_StorageRegistry_STORAGE_CREATED, name); - gtk_object_unref (GTK_OBJECT (p->data)); + g_object_unref (p->data); } g_list_free (storage_list); @@ -399,7 +399,7 @@ impl_finalize (GObject *object) priv = corba_storage_registry->priv; if (priv->storage_set != NULL) - gtk_object_unref (GTK_OBJECT (priv->storage_set)); + g_object_unref (priv->storage_set); g_free (priv); (* G_OBJECT_CLASS (parent_class)->finalize) (object); @@ -452,7 +452,7 @@ e_corba_storage_registry_construct (ECorbaStorageRegistry *corba_storage_registr priv = corba_storage_registry->priv; - gtk_object_ref (GTK_OBJECT (storage_set)); + g_object_ref (storage_set); priv->storage_set = storage_set; } diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c index b94f796e8a..642eef2f80 100644 --- a/shell/e-corba-storage.c +++ b/shell/e-corba-storage.c @@ -75,7 +75,7 @@ storage_listener_servant_new (ECorbaStorage *corba_storage) servant->servant.vepv = &storage_listener_vepv; - gtk_object_ref (GTK_OBJECT (corba_storage)); + g_object_ref (corba_storage); servant->storage = E_STORAGE (corba_storage); return servant; @@ -84,7 +84,7 @@ storage_listener_servant_new (ECorbaStorage *corba_storage) static void storage_listener_servant_free (StorageListenerServant *servant) { - gtk_object_unref (GTK_OBJECT (servant->storage)); + g_object_unref (servant->storage); g_free (servant); } @@ -127,7 +127,7 @@ impl_StorageListener_notifyFolderCreated (PortableServer_Servant servant, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_StorageListener_Exists, NULL); - gtk_object_unref (GTK_OBJECT (e_folder)); + g_object_unref (e_folder); return; } } @@ -467,7 +467,7 @@ async_open_folder_idle (gpointer data) CORBA_exception_free (&ev); } - gtk_object_unref (GTK_OBJECT (storage)); + g_object_unref (storage); g_free (path); g_free (pair); @@ -480,7 +480,7 @@ async_open_folder (EStorage *storage, { gpointer *pair = g_new (gpointer, 2); pair[0] = storage; - gtk_object_ref (GTK_OBJECT (storage)); + g_object_ref (storage); pair[1] = g_strdup (path); g_idle_add (async_open_folder_idle, pair); diff --git a/shell/e-folder-list.c b/shell/e-folder-list.c index 24e00fa907..1c318bad5b 100644 --- a/shell/e-folder-list.c +++ b/shell/e-folder-list.c @@ -142,7 +142,7 @@ e_folder_list_destroy (GtkObject *object) EFolderList *efl = E_FOLDER_LIST (object); if (efl->priv->gui) - gtk_object_unref (GTK_OBJECT (efl->priv->gui)); + g_object_unref (efl->priv->gui); if (efl->priv->client) g_object_unref (efl->priv->client); @@ -436,10 +436,10 @@ e_folder_list_init (EFolderList *efl) selection_model = e_table_get_selection_model (e_table_scrolled_get_table (efl->priv->scrolled_table)); - gtk_signal_connect (GTK_OBJECT (selection_model), "selection_changed", - GTK_SIGNAL_FUNC (selection_changed), efl); - gtk_signal_connect (GTK_OBJECT (selection_model), "cursor_changed", - GTK_SIGNAL_FUNC (cursor_changed), efl); + g_signal_connect (selection_model, "selection_changed", + G_CALLBACK (selection_changed), efl); + g_signal_connect (selection_model, "cursor_changed", + G_CALLBACK (cursor_changed), efl); efl->priv->possible_types = NULL; set_frame_label (efl); diff --git a/shell/e-local-folder.c b/shell/e-local-folder.c index 3f58e09a3d..46de41334a 100644 --- a/shell/e-local-folder.c +++ b/shell/e-local-folder.c @@ -447,7 +447,7 @@ e_local_folder_new_from_path (const char *path) folder = gtk_type_new (e_local_folder_get_type ()); if (! construct_loading_metadata (E_LOCAL_FOLDER (folder), path)) { - gtk_object_unref (GTK_OBJECT (folder)); + g_object_unref (folder); return NULL; } diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index ebd534e4a6..721ec40a27 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -197,15 +197,17 @@ load_folder (const char *physical_path, folder = e_local_folder_new_from_path (physical_path); if (folder == NULL) { - g_warning ("No folder metadata in %s... ignoring", physical_path); + /* g_warning ("No folder metadata in %s... ignoring", physical_path); FIXME */ return TRUE; } /* Ignore the folder if it uses an unknown type. */ if (! e_folder_type_registry_type_registered (local_storage->priv->folder_type_registry, e_folder_get_type_string (folder))) { +#if 0 g_warning ("Folder in %s has unknown type (%s)... ignoring", physical_path, e_folder_get_type_string (folder)); +#endif return TRUE; } @@ -314,7 +316,7 @@ component_async_create_folder_callback (EvolutionShellComponentClient *shell_com callback_data->path, folder); } else { rmdir (callback_data->physical_path); - gtk_object_unref (GTK_OBJECT (folder)); + g_object_unref (folder); storage_result = E_STORAGE_IOERROR; } } @@ -323,7 +325,7 @@ component_async_create_folder_callback (EvolutionShellComponentClient *shell_com if (callback_data->listener != CORBA_OBJECT_NIL) notify_listener (callback_data->listener, storage_result, - callback_data->physical_path); + callback_data->physical_path); if (callback_data->callback != NULL) (* callback_data->callback) (callback_data->storage, @@ -692,7 +694,7 @@ impl_destroy (GtkObject *object) g_free (priv->base_path); if (priv->folder_type_registry != NULL) - gtk_object_unref (GTK_OBJECT (priv->folder_type_registry)); + g_object_unref (priv->folder_type_registry); if (priv->bonobo_interface != NULL) bonobo_object_unref (BONOBO_OBJECT (priv->bonobo_interface)); @@ -1115,7 +1117,7 @@ construct (ELocalStorage *local_storage, g_return_val_if_fail (base_path_len != 0, FALSE); g_assert (priv->folder_type_registry == NULL); - gtk_object_ref (GTK_OBJECT (folder_type_registry)); + g_object_ref (folder_type_registry); priv->folder_type_registry = folder_type_registry; g_assert (priv->base_path == NULL); @@ -1124,15 +1126,15 @@ construct (ELocalStorage *local_storage, g_assert (priv->bonobo_interface == NULL); priv->bonobo_interface = evolution_storage_new (E_LOCAL_STORAGE_NAME, FALSE); - gtk_signal_connect (GTK_OBJECT (priv->bonobo_interface), "create_folder", - GTK_SIGNAL_FUNC (bonobo_interface_create_folder_cb), - local_storage); - gtk_signal_connect (GTK_OBJECT (priv->bonobo_interface), "remove_folder", - GTK_SIGNAL_FUNC (bonobo_interface_remove_folder_cb), - local_storage); - gtk_signal_connect (GTK_OBJECT (priv->bonobo_interface), "update_folder", - GTK_SIGNAL_FUNC (bonobo_interface_update_folder_cb), - local_storage); + g_signal_connect (priv->bonobo_interface, "create_folder", + G_CALLBACK (bonobo_interface_create_folder_cb), + local_storage); + g_signal_connect (priv->bonobo_interface, "remove_folder", + G_CALLBACK (bonobo_interface_remove_folder_cb), + local_storage); + g_signal_connect (priv->bonobo_interface, "update_folder", + G_CALLBACK (bonobo_interface_update_folder_cb), + local_storage); return load_all_folders (local_storage); } @@ -1150,7 +1152,7 @@ e_local_storage_open (EFolderTypeRegistry *folder_type_registry, new = gtk_type_new (e_local_storage_get_type ()); if (! construct (E_LOCAL_STORAGE (new), folder_type_registry, base_path)) { - gtk_object_unref (GTK_OBJECT (new)); + g_object_unref (new); return NULL; } diff --git a/shell/e-setup.c b/shell/e-setup.c index 5be3e16aef..2ad5c0c151 100644 --- a/shell/e-setup.c +++ b/shell/e-setup.c @@ -403,7 +403,7 @@ e_setup (const char *evolution_directory) } if (local_folder != NULL) - gtk_object_unref (GTK_OBJECT (local_folder)); + g_object_unref (local_folder); } g_free (file); diff --git a/shell/e-shell-config-autocompletion.c b/shell/e-shell-config-autocompletion.c index 51c6728dc8..bc0bf8a3cd 100644 --- a/shell/e-shell-config-autocompletion.c +++ b/shell/e-shell-config-autocompletion.c @@ -111,12 +111,12 @@ e_shell_config_autocompletion_create_widget (EShell *shell, EvolutionConfigContr ac->config_control = config_control; - gtk_signal_connect (GTK_OBJECT (ac->control_widget), "changed", - GTK_SIGNAL_FUNC (folder_list_changed_callback), ac); - gtk_signal_connect (GTK_OBJECT (ac->config_control), "apply", - GTK_SIGNAL_FUNC (config_control_apply_callback), ac); - gtk_signal_connect (GTK_OBJECT (ac->config_control), "destroy", - GTK_SIGNAL_FUNC (config_control_destroy_callback), ac); + g_signal_connect (ac->control_widget, "changed", + G_CALLBACK (folder_list_changed_callback), ac); + g_signal_connect (ac->config_control, "apply", + G_CALLBACK (config_control_apply_callback), ac); + g_signal_connect (ac->config_control, "destroy", + G_CALLBACK (config_control_destroy_callback), ac); CORBA_exception_free (&ev); diff --git a/shell/e-shell-config-default-folders.c b/shell/e-shell-config-default-folders.c index 333ec2c0a8..2f152ec9fb 100644 --- a/shell/e-shell-config-default-folders.c +++ b/shell/e-shell-config-default-folders.c @@ -109,7 +109,7 @@ config_control_destroy_cb (EvolutionConfigControl *config_control, g_free (dfc->tasks_uri); g_free (dfc->tasks_path); - gtk_object_unref (GTK_OBJECT (dfc->glade)); + g_object_unref (dfc->glade); bonobo_object_unref (BONOBO_OBJECT (dfc->shell_client)); g_free (dfc); } @@ -138,9 +138,9 @@ setup_folder_selector (EvolutionDefaultFolderConfig *dfc, *uri_ptr, types); gtk_object_set_data (GTK_OBJECT (button), "uri_ptr", uri_ptr); gtk_object_set_data (GTK_OBJECT (button), "path_ptr", path_ptr); - gtk_signal_connect (GTK_OBJECT (button), "selected", - GTK_SIGNAL_FUNC (folder_selected), - dfc); + g_signal_connect (button, "selected", + G_CALLBACK (folder_selected), + dfc); } GtkWidget* @@ -185,10 +185,10 @@ e_shell_config_default_folders_create_widget (EShell *shell, EvolutionConfigCont gtk_widget_show (widget); dfc->config_control = config_control; - gtk_signal_connect (GTK_OBJECT (dfc->config_control), "apply", - GTK_SIGNAL_FUNC (config_control_apply_cb), dfc); - gtk_signal_connect (GTK_OBJECT (dfc->config_control), "destroy", - GTK_SIGNAL_FUNC (config_control_destroy_cb), dfc); + g_signal_connect (dfc->config_control, "apply", + G_CALLBACK (config_control_apply_cb), dfc); + g_signal_connect (dfc->config_control, "destroy", + G_CALLBACK (config_control_destroy_cb), dfc); return widget; } diff --git a/shell/e-shell-config-offline.c b/shell/e-shell-config-offline.c index 205bb9d3f6..405426b36d 100644 --- a/shell/e-shell-config-offline.c +++ b/shell/e-shell-config-offline.c @@ -195,8 +195,8 @@ e_shell_config_offline_create_widget (EShell *shell, EvolutionConfigControl *con gtk_widget_show (page_data->storage_set_view); init_storage_set_view_status_from_config (E_STORAGE_SET_VIEW (page_data->storage_set_view), shell); - gtk_signal_connect (GTK_OBJECT (page_data->storage_set_view), "checkboxes_changed", - GTK_SIGNAL_FUNC (storage_set_view_checkboxes_changed_callback), page_data); + g_signal_connect (page_data->storage_set_view, "checkboxes_changed", + G_CALLBACK (storage_set_view_checkboxes_changed_callback), page_data); scroll_frame = e_scroll_frame_new (NULL, NULL); e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame), GTK_SHADOW_IN); @@ -207,10 +207,10 @@ e_shell_config_offline_create_widget (EShell *shell, EvolutionConfigControl *con page_data->config_control = control; - gtk_signal_connect (GTK_OBJECT (page_data->config_control), "destroy", - GTK_SIGNAL_FUNC (config_control_destroy_callback), page_data); - gtk_signal_connect (GTK_OBJECT (page_data->config_control), "apply", - GTK_SIGNAL_FUNC (config_control_apply_callback), page_data); + g_signal_connect (page_data->config_control, "destroy", + G_CALLBACK (config_control_destroy_callback), page_data); + g_signal_connect (page_data->config_control, "apply", + G_CALLBACK (config_control_apply_callback), page_data); return scroll_frame; } diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c index 8fa237ae0b..fd6cf2b522 100644 --- a/shell/e-shell-folder-commands.c +++ b/shell/e-shell-folder-commands.c @@ -234,13 +234,13 @@ connect_folder_selection_dialog_signals (EShellFolderSelectionDialog *folder_sel { g_assert (folder_command_data != NULL); - gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "folder_selected", - GTK_SIGNAL_FUNC (folder_selection_dialog_folder_selected_callback), - folder_command_data); + g_signal_connect (folder_selection_dialog, "folder_selected", + G_CALLBACK (folder_selection_dialog_folder_selected_callback), + folder_command_data); - gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "cancelled", - GTK_SIGNAL_FUNC (folder_selection_dialog_cancelled_callback), - folder_command_data); + g_signal_connect (folder_selection_dialog, "cancelled", + G_CALLBACK (folder_selection_dialog_cancelled_callback), + folder_command_data); } @@ -460,7 +460,7 @@ rename_callback_data_new (EShellView *shell_view, callback_data = g_new (RenameCallbackData, 1); - gtk_object_ref (GTK_OBJECT (shell_view)); + g_object_ref (shell_view); callback_data->shell_view = shell_view; callback_data->new_path = g_strdup (new_path); @@ -471,7 +471,7 @@ rename_callback_data_new (EShellView *shell_view, static void rename_callback_data_free (RenameCallbackData *callback_data) { - gtk_object_unref (GTK_OBJECT (callback_data->shell_view)); + g_object_unref (callback_data->shell_view); g_free (callback_data->new_path); g_free (callback_data); 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); } diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c index 3c9df7cbce..46c6e0dde3 100644 --- a/shell/e-shell-folder-selection-dialog.c +++ b/shell/e-shell-folder-selection-dialog.c @@ -187,7 +187,7 @@ impl_destroy (GtkObject *object) save_expanded_state (folder_selection_dialog); if (priv->storage_set != NULL) - gtk_object_unref (GTK_OBJECT (priv->storage_set)); + g_object_unref (priv->storage_set); e_free_string_list (priv->allowed_types); @@ -386,8 +386,8 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s gtk_window_set_default_size (GTK_WINDOW (folder_selection_dialog), 350, 300); gtk_window_set_modal (GTK_WINDOW (folder_selection_dialog), TRUE); gtk_window_set_title (GTK_WINDOW (folder_selection_dialog), title); - gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "delete_event", - GTK_SIGNAL_FUNC (delete_event_cb), folder_selection_dialog); + g_signal_connect (folder_selection_dialog, "delete_event", + G_CALLBACK (delete_event_cb), folder_selection_dialog); gnome_dialog_append_buttons (GNOME_DIALOG (folder_selection_dialog), GNOME_STOCK_BUTTON_OK, @@ -399,10 +399,12 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s /* Make sure we get destroyed if the shell gets destroyed. */ +#if 0 priv->shell = shell; gtk_signal_connect_object_while_alive (GTK_OBJECT (shell), "destroy", - GTK_SIGNAL_FUNC (gtk_widget_destroy), + G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (folder_selection_dialog)); +#endif /* Set up the label. */ @@ -417,7 +419,7 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s /* Set up the storage set and its view. */ priv->storage_set = e_shell_get_storage_set (shell); - gtk_object_ref (GTK_OBJECT (priv->storage_set)); + g_object_ref (priv->storage_set); priv->storage_set_view = e_storage_set_create_new_view (priv->storage_set, NULL); e_storage_set_view_set_allow_dnd (E_STORAGE_SET_VIEW (priv->storage_set_view), FALSE); @@ -432,12 +434,8 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s g_free (filename); - gtk_signal_connect (GTK_OBJECT (priv->storage_set_view), "double_click", - GTK_SIGNAL_FUNC (double_click_cb), - folder_selection_dialog); - gtk_signal_connect (GTK_OBJECT (priv->storage_set_view), "folder_selected", - GTK_SIGNAL_FUNC (folder_selected_cb), - folder_selection_dialog); + g_signal_connect (priv->storage_set_view, "double_click", G_CALLBACK (double_click_cb), folder_selection_dialog); + g_signal_connect (priv->storage_set_view, "folder_selected", G_CALLBACK (folder_selected_cb), folder_selection_dialog); g_assert (priv->allowed_types == NULL); if (allowed_types != NULL) { diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c index a5ed4ef7ff..40d8b8ad65 100644 --- a/shell/e-shell-folder-title-bar.c +++ b/shell/e-shell-folder-title-bar.c @@ -345,8 +345,8 @@ add_navigation_buttons (EShellFolderTitleBar *folder_title_bar) back_pixmap = create_pixmap_widget_from_xpm (left_arrow_xpm); gtk_container_add (GTK_CONTAINER (priv->back_button), back_pixmap); - gtk_signal_connect (GTK_OBJECT (priv->back_button), "clicked", - GTK_SIGNAL_FUNC (back_button_clicked_callback), folder_title_bar); + g_signal_connect (priv->back_button, "clicked", + G_CALLBACK (back_button_clicked_callback), folder_title_bar); priv->forward_button = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (priv->forward_button), GTK_RELIEF_NONE); @@ -355,8 +355,8 @@ add_navigation_buttons (EShellFolderTitleBar *folder_title_bar) forward_pixmap = create_pixmap_widget_from_xpm (right_arrow_xpm); gtk_container_add (GTK_CONTAINER (priv->forward_button), forward_pixmap); - gtk_signal_connect (GTK_OBJECT (priv->forward_button), "clicked", - GTK_SIGNAL_FUNC (forward_button_clicked_callback), folder_title_bar); + g_signal_connect (priv->forward_button, "clicked", + G_CALLBACK (forward_button_clicked_callback), folder_title_bar); gtk_box_pack_start (GTK_BOX (folder_title_bar), priv->back_button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (folder_title_bar), priv->forward_button, FALSE, FALSE, 0); @@ -578,8 +578,8 @@ e_shell_folder_title_bar_construct (EShellFolderTitleBar *folder_title_bar) GTK_WIDGET (priv->title_button)->style->xthickness, GTK_WIDGET (priv->title_button)->style->ythickness + 2); - gtk_signal_connect (GTK_OBJECT (priv->title_button), "toggled", - GTK_SIGNAL_FUNC (title_button_toggled_cb), folder_title_bar); + g_signal_connect (priv->title_button, "toggled", + G_CALLBACK (title_button_toggled_cb), folder_title_bar); add_navigation_buttons (folder_title_bar); diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index dc2e66d928..31721660b0 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -166,8 +166,8 @@ create_html (const char *name) html = gtk_html_new (); GTK_LAYOUT (html)->height = 0; - gtk_signal_connect (GTK_OBJECT (html), "size_request", - GTK_SIGNAL_FUNC (html_size_req), NULL); + g_signal_connect (html, "size_request", + G_CALLBACK (html_size_req), NULL); gtk_html_set_editable (GTK_HTML (html), FALSE); style = gtk_rc_get_style (html); if (!style) @@ -262,7 +262,7 @@ import_cb (EvolutionImporterListener *listener, if (!icd->destroyed) gtk_object_destroy (GTK_OBJECT (icd->dialog)); bonobo_object_unref (BONOBO_OBJECT (icd->listener)); - gtk_object_unref (GTK_OBJECT (icd->client)); + g_object_unref (icd->client); g_free (icd); OUT; @@ -509,10 +509,10 @@ start_import (const char *folderpath, icd->dialog = GNOME_DIALOG (gnome_dialog_new (_("Importing"), GNOME_STOCK_BUTTON_CANCEL, NULL)); - gtk_signal_connect (GTK_OBJECT (icd->dialog), "clicked", - GTK_SIGNAL_FUNC (dialog_clicked_cb), icd); - gtk_signal_connect (GTK_OBJECT (icd->dialog), "destroy", - GTK_SIGNAL_FUNC (dialog_destroy_cb), icd); + g_signal_connect (icd->dialog, "clicked", + G_CALLBACK (dialog_clicked_cb), icd); + g_signal_connect (icd->dialog, "destroy", + G_CALLBACK (dialog_destroy_cb), icd); label = g_strdup_printf (_("Importing %s.\nStarting %s"), filename, real_iid); @@ -534,7 +534,7 @@ start_import (const char *folderpath, while (gtk_events_pending ()) gtk_main_iteration (); - gtk_object_unref (GTK_OBJECT (icd->dialog)); + g_object_unref (icd->dialog); g_free (icd); return; } @@ -554,8 +554,8 @@ start_import (const char *folderpath, while (gtk_events_pending ()) gtk_main_iteration (); - gtk_object_unref (GTK_OBJECT (icd->client)); - gtk_object_unref (GTK_OBJECT (icd->dialog)); + g_object_unref (icd->client); + g_object_unref (icd->dialog); g_free (icd); return; } @@ -638,8 +638,8 @@ create_plugin_menu (ImportData *data) item = gtk_menu_item_new_with_label (name); g_free (name); gtk_widget_show (item); - gtk_signal_connect (GTK_OBJECT (item), "activate", - GTK_SIGNAL_FUNC (item_selected), data); + g_signal_connect (item, "activate", + G_CALLBACK (item_selected), data); gtk_object_set_data_full (GTK_OBJECT (item), "oafiid", g_strdup (info->iid), g_free); @@ -674,9 +674,8 @@ importer_file_page_new (ImportData *data) gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); page->filename = gnome_file_entry_new ("Evolution_Importer_FileName", _("Select a file")); - gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (page->filename))), - "changed", GTK_SIGNAL_FUNC (filename_changed), - data); + g_signal_connect (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (page->filename)), "changed", + G_CALLBACK (filename_changed), data); gtk_table_attach (GTK_TABLE (table), page->filename, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0); @@ -798,7 +797,7 @@ prepare_intelligent_page (GnomeDruid *druid, Do not collect $200 */ import->running = 0; gnome_druid_set_page (druid, GNOME_DRUID_PAGE (data->finish)) -; + ; gtk_widget_destroy (dialog); return TRUE; } @@ -943,7 +942,7 @@ static void import_druid_destroy (GtkObject *object, ImportData *data) { - gtk_object_unref (GTK_OBJECT (data->wizard)); + g_object_unref (data->wizard); g_free (data->choosen_iid); g_free (data); } @@ -1077,10 +1076,10 @@ import_druid_finish (GnomeDruidPage *page, e_shell_view_get_current_uri (data->view), NULL); - gtk_signal_connect (GTK_OBJECT (folder), "folder_selected", - GTK_SIGNAL_FUNC (folder_selected), data); - gtk_signal_connect (GTK_OBJECT (folder), "cancelled", - GTK_SIGNAL_FUNC (folder_cancelled), data); + g_signal_connect (folder, "folder_selected", + G_CALLBACK (folder_selected), data); + g_signal_connect (folder, "cancelled", + G_CALLBACK (folder_cancelled), data); gtk_widget_hide (data->dialog); gtk_widget_show (folder); @@ -1132,8 +1131,8 @@ next_type_page (GnomeDruidPage *page, static gboolean back_finish_page (GnomeDruidPage *page, - GnomeDruid *druid, - ImportData *data) + GnomeDruid *druid, + ImportData *data) { if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->typepage->intelligent))) { if (data->importerpage->running != 0) { @@ -1217,20 +1216,20 @@ show_import_wizard (BonoboUIComponent *component, gtk_window_set_wmclass (GTK_WINDOW (data->dialog), "importdruid", "Evolution:shell"); gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (user_data)); - gtk_signal_connect (GTK_OBJECT (data->dialog), "destroy", - GTK_SIGNAL_FUNC (close_dialog), &dialog_open); + g_signal_connect (data->dialog, "destroy", + G_CALLBACK (close_dialog), &dialog_open); gnome_dialog_close_hides (GNOME_DIALOG (data->dialog), TRUE); data->druid = glade_xml_get_widget (data->wizard, "druid1"); - gtk_signal_connect (GTK_OBJECT (data->druid), "cancel", - GTK_SIGNAL_FUNC (import_druid_cancel), data); + g_signal_connect (data->druid, "cancel", + G_CALLBACK (import_druid_cancel), data); druid_finish_button_change (GNOME_DRUID (data->druid)); data->start = GNOME_DRUID_PAGE_START (glade_xml_get_widget (data->wizard, "page0")); data->typedialog = glade_xml_get_widget (data->wizard, "page1"); - gtk_signal_connect (GTK_OBJECT (data->typedialog), "next", - GTK_SIGNAL_FUNC (next_type_page), data); + g_signal_connect (data->typedialog, "next", + G_CALLBACK (next_type_page), data); data->typepage = importer_type_page_new (data); html = create_html ("type_html"); gtk_box_pack_start (GTK_BOX (data->typepage->vbox), html, FALSE, TRUE, 0); @@ -1239,12 +1238,12 @@ show_import_wizard (BonoboUIComponent *component, gtk_box_pack_start (GTK_BOX (GNOME_DRUID_PAGE_STANDARD (data->typedialog)->vbox), data->typepage->vbox, TRUE, TRUE, 0); data->intelligent = glade_xml_get_widget (data->wizard, "page2-intelligent"); - gtk_signal_connect (GTK_OBJECT (data->intelligent), "next", - GTK_SIGNAL_FUNC (next_intelligent_page), data); - gtk_signal_connect (GTK_OBJECT (data->intelligent), "back", - GTK_SIGNAL_FUNC (back_intelligent_page), data); - gtk_signal_connect (GTK_OBJECT (data->intelligent), "prepare", - GTK_SIGNAL_FUNC (prepare_intelligent_page), data); + g_signal_connect (data->intelligent, "next", + G_CALLBACK (next_intelligent_page), data); + g_signal_connect (data->intelligent, "back", + G_CALLBACK (back_intelligent_page), data); + g_signal_connect (data->intelligent, "prepare", + G_CALLBACK (prepare_intelligent_page), data); data->importerpage = importer_importer_page_new (data); html = create_html ("intelligent_html"); @@ -1255,16 +1254,16 @@ show_import_wizard (BonoboUIComponent *component, data->filedialog = glade_xml_get_widget (data->wizard, "page2-file"); - gtk_signal_connect (GTK_OBJECT (data->filedialog), "prepare", - GTK_SIGNAL_FUNC (prepare_file_page), data); - gtk_signal_connect (GTK_OBJECT (data->filedialog), "next", - GTK_SIGNAL_FUNC (next_file_page), data); - gtk_signal_connect (GTK_OBJECT (data->filedialog), "back", - GTK_SIGNAL_FUNC (back_file_page), data); + g_signal_connect (data->filedialog, "prepare", + G_CALLBACK (prepare_file_page), data); + g_signal_connect (data->filedialog, "next", + G_CALLBACK (next_file_page), data); + g_signal_connect (data->filedialog, "back", + G_CALLBACK (back_file_page), data); data->finish = GNOME_DRUID_PAGE_FINISH (glade_xml_get_widget (data->wizard, "page3")); - gtk_signal_connect (GTK_OBJECT (data->finish), "back", - GTK_SIGNAL_FUNC (back_finish_page), data); + g_signal_connect (data->finish, "back", + G_CALLBACK (back_finish_page), data); data->filepage = importer_file_page_new (data); @@ -1275,10 +1274,10 @@ show_import_wizard (BonoboUIComponent *component, gtk_box_pack_start (GTK_BOX (GNOME_DRUID_PAGE_STANDARD (data->filedialog)->vbox), data->filepage->vbox, TRUE, TRUE, 0); /* Finish page */ - gtk_signal_connect (GTK_OBJECT (data->finish), "finish", - GTK_SIGNAL_FUNC (import_druid_finish), data); - gtk_signal_connect (GTK_OBJECT (data->dialog), "destroy", - GTK_SIGNAL_FUNC (import_druid_destroy), data); + g_signal_connect (data->finish, "finish", + G_CALLBACK (import_druid_finish), data); + g_signal_connect (data->dialog, "destroy", + G_CALLBACK (import_druid_destroy), data); gtk_widget_show_all (data->dialog); } diff --git a/shell/e-shell-offline-handler.c b/shell/e-shell-offline-handler.c index 034b722ded..9e30b6d9c9 100644 --- a/shell/e-shell-offline-handler.c +++ b/shell/e-shell-offline-handler.c @@ -499,7 +499,7 @@ finalize_offline (EShellOfflineHandler *offline_handler) priv = offline_handler->priv; - gtk_object_ref (GTK_OBJECT (offline_handler)); + g_object_ref (offline_handler); g_hash_table_foreach (priv->id_to_component_info, finalize_offline_hash_foreach, offline_handler); @@ -509,7 +509,7 @@ finalize_offline (EShellOfflineHandler *offline_handler) priv->finished = TRUE; } - gtk_object_unref (GTK_OBJECT (offline_handler)); + g_object_unref (offline_handler); } @@ -596,7 +596,7 @@ dialog_handle_cancel (GnomeDialog *dialog, gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_object_unref (GTK_OBJECT (priv->dialog_gui)); + g_object_unref (priv->dialog_gui); priv->dialog_gui = NULL; cancel_offline (offline_handler); @@ -653,8 +653,8 @@ pop_up_confirmation_dialog (EShellOfflineHandler *offline_handler) update_dialog_clist (offline_handler); - gtk_signal_connect (GTK_OBJECT (dialog), "clicked", - GTK_SIGNAL_FUNC (dialog_clicked_cb), offline_handler); + g_signal_connect (dialog, "clicked", + G_CALLBACK (dialog_clicked_cb), offline_handler); gtk_widget_show (dialog); } @@ -682,7 +682,7 @@ impl_destroy (GtkObject *object) dialog = glade_xml_get_widget (priv->dialog_gui, "active_connection_dialog"); gtk_widget_destroy (dialog); - gtk_object_unref (GTK_OBJECT (priv->dialog_gui)); + g_object_unref (priv->dialog_gui); priv->dialog_gui = NULL; } @@ -817,7 +817,7 @@ e_shell_offline_handler_put_components_offline (EShellOfflineHandler *offline_ha /* Add an extra ref here as the signal handlers might want to unref us. */ - gtk_object_ref (GTK_OBJECT (offline_handler)); + g_object_ref (offline_handler); gtk_signal_emit (GTK_OBJECT (offline_handler), signals[OFFLINE_PROCEDURE_STARTED]); @@ -828,7 +828,7 @@ e_shell_offline_handler_put_components_offline (EShellOfflineHandler *offline_ha g_warning ("Couldn't put components off-line"); gtk_signal_emit (GTK_OBJECT (offline_handler), signals[OFFLINE_PROCEDURE_FINISHED], FALSE); priv->finished = TRUE; - gtk_object_unref (GTK_OBJECT (offline_handler)); + g_object_unref (offline_handler); return; } @@ -840,7 +840,7 @@ e_shell_offline_handler_put_components_offline (EShellOfflineHandler *offline_ha finalize_offline (offline_handler); } - gtk_object_unref (GTK_OBJECT (offline_handler)); + g_object_unref (offline_handler); } diff --git a/shell/e-shell-offline-sync.c b/shell/e-shell-offline-sync.c index 7dc48bc6fa..b47638bf4a 100644 --- a/shell/e-shell-offline-sync.c +++ b/shell/e-shell-offline-sync.c @@ -242,10 +242,10 @@ setup_dialog (SyncData *sync_data) gtk_widget_set_usize (sync_data->dialog, 300, -1); gtk_window_set_policy (GTK_WINDOW (sync_data->dialog), FALSE, FALSE, FALSE); - gtk_signal_connect (GTK_OBJECT (sync_data->dialog), "close", - GTK_SIGNAL_FUNC (progress_dialog_close_callback), sync_data); - gtk_signal_connect (GTK_OBJECT (sync_data->dialog), "clicked", - GTK_SIGNAL_FUNC (progress_dialog_clicked_callback), sync_data); + g_signal_connect (sync_data->dialog, "close", + G_CALLBACK (progress_dialog_close_callback), sync_data); + g_signal_connect (sync_data->dialog, "clicked", + G_CALLBACK (progress_dialog_clicked_callback), sync_data); sync_data->label = gtk_label_new (""); gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (sync_data->dialog)->vbox), diff --git a/shell/e-shell-shared-folder-picker-dialog.c b/shell/e-shell-shared-folder-picker-dialog.c index e9fb66f544..47677af347 100644 --- a/shell/e-shell-shared-folder-picker-dialog.c +++ b/shell/e-shell-shared-folder-picker-dialog.c @@ -137,7 +137,7 @@ setup_name_selector (GladeXML *glade_xml) gtk_widget_show (control_widget); button = glade_xml_get_widget (glade_xml, "button-user"); - gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (user_clicked), corba_iface); + g_signal_connect (button, "clicked", G_CALLBACK (user_clicked), corba_iface); CORBA_exception_free (&ev); return control_widget; @@ -190,9 +190,9 @@ setup_server_option_menu (EShell *shell, storage_name = e_storage_get_name (E_STORAGE (p->data)); menu_item = e_utf8_gtk_menu_item_new_with_label (GTK_MENU (menu), storage_name); - gtk_signal_connect (GTK_OBJECT (menu_item), "activate", - GTK_SIGNAL_FUNC (server_option_menu_item_activate_callback), - storage_name_return); + g_signal_connect (menu_item, "activate", + G_CALLBACK (server_option_menu_item_activate_callback), + storage_name_return); gtk_object_set_data_full (GTK_OBJECT (menu_item), "storage_name", g_strdup (storage_name), g_free); @@ -277,7 +277,7 @@ cleanup_discovery (DiscoveryData *discovery_data) g_free (discovery_data->user_email_address); g_free (discovery_data->folder_name); - gtk_object_unref (GTK_OBJECT (discovery_data->storage)); + g_object_unref (discovery_data->storage); g_free (discovery_data); } @@ -359,8 +359,8 @@ create_progress_dialog (EShell *shell, gtk_widget_set_usize (dialog, 300, -1); gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, FALSE, FALSE); - gtk_signal_connect (GTK_OBJECT (dialog), "close", - GTK_SIGNAL_FUNC (progress_dialog_close_callback), NULL); + g_signal_connect (dialog, "close", + G_CALLBACK (progress_dialog_close_callback), NULL); text = g_strdup_printf (_("Opening Folder \"%s\""), folder_name); label = gtk_label_new (text); @@ -377,14 +377,14 @@ create_progress_dialog (EShell *shell, gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), progress_bar, FALSE, TRUE, 0); timeout_id = g_timeout_add (50, progress_bar_timeout_callback, progress_bar); - gtk_signal_connect (GTK_OBJECT (progress_bar), "destroy", - GTK_SIGNAL_FUNC (progress_bar_destroy_callback), - GINT_TO_POINTER (timeout_id)); + g_signal_connect (progress_bar, "destroy", + G_CALLBACK (progress_bar_destroy_callback), + GINT_TO_POINTER (timeout_id)); timeout_id = g_timeout_add (PROGRESS_DIALOG_DELAY, progress_dialog_show_timeout_callback, dialog); - gtk_signal_connect (GTK_OBJECT (progress_bar), "destroy", - GTK_SIGNAL_FUNC (progress_bar_destroy_callback), - GINT_TO_POINTER (timeout_id)); + g_signal_connect (progress_bar, "destroy", + G_CALLBACK (progress_bar_destroy_callback), + GINT_TO_POINTER (timeout_id)); return dialog; } @@ -487,19 +487,19 @@ discover_folder (EShell *shell, discovery_data->user_email_address = g_strdup (user_email_address); discovery_data->folder_name = g_strdup (folder_name); discovery_data->storage = storage; - gtk_object_ref (GTK_OBJECT (storage)); + g_object_ref (storage); - gtk_signal_connect (GTK_OBJECT (shell), "destroy", - GTK_SIGNAL_FUNC (shell_destroy_callback), discovery_data); + g_signal_connect (shell, "destroy", + G_CALLBACK (shell_destroy_callback), discovery_data); - gtk_signal_connect (GTK_OBJECT (parent), "destroy", - GTK_SIGNAL_FUNC (shell_view_destroy_callback), discovery_data); + g_signal_connect (parent, "destroy", + G_CALLBACK (shell_view_destroy_callback), discovery_data); - gtk_signal_connect (GTK_OBJECT (storage), "destroy", - GTK_SIGNAL_FUNC (storage_destroy_callback), discovery_data); + g_signal_connect (storage, "destroy", + G_CALLBACK (storage_destroy_callback), discovery_data); - gtk_signal_connect (GTK_OBJECT (dialog), "clicked", - GTK_SIGNAL_FUNC (progress_dialog_clicked_callback), discovery_data); + g_signal_connect (dialog, "clicked", + G_CALLBACK (progress_dialog_clicked_callback), discovery_data); e_storage_async_discover_shared_folder (storage, user_email_address, diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c index dacf62ead1..04b36e2a4f 100644 --- a/shell/e-shell-startup-wizard.c +++ b/shell/e-shell-startup-wizard.c @@ -173,8 +173,8 @@ make_mail_dialog_pages (SWData *data) data->event_source = Bonobo_Unknown_queryInterface (data->mailer, "IDL:Bonobo/EventSource:1.0", &ev); CORBA_exception_free (&ev); data->listener = bonobo_listener_new (NULL, NULL); - gtk_signal_connect (GTK_OBJECT (data->listener), "event-notify", - GTK_SIGNAL_FUNC (druid_event_notify_cb), data); + g_signal_connect (data->listener, "event-notify", + G_CALLBACK (druid_event_notify_cb), data); object = bonobo_object_corba_objref (BONOBO_OBJECT (data->listener)); CORBA_exception_init (&ev); @@ -367,7 +367,7 @@ finish_func (GnomeDruidPage *page, /* Need to do this otherwise the timezone widget gets destroyed but the timezone object isn't, and we can get a crash like #22047. */ - gtk_object_unref (GTK_OBJECT (data->timezone_page->etd)); + g_object_unref (data->timezone_page->etd); data->timezone_page->etd = NULL; gtk_widget_destroy (data->dialog); @@ -380,14 +380,14 @@ static void connect_page (GtkWidget *page, SWData *data) { - gtk_signal_connect (GTK_OBJECT (page), "next", - GTK_SIGNAL_FUNC (next_func), data); - gtk_signal_connect (GTK_OBJECT (page), "prepare", - GTK_SIGNAL_FUNC (prepare_func), data); - gtk_signal_connect (GTK_OBJECT (page), "back", - GTK_SIGNAL_FUNC (back_func), data); - gtk_signal_connect (GTK_OBJECT (page), "finish", - GTK_SIGNAL_FUNC (finish_func), data); + g_signal_connect (page, "next", + G_CALLBACK (next_func), data); + g_signal_connect (page, "prepare", + G_CALLBACK (prepare_func), data); + g_signal_connect (page, "back", + G_CALLBACK (back_func), data); + g_signal_connect (page, "finish", + G_CALLBACK (finish_func), data); } static MailDialogPage * @@ -805,8 +805,8 @@ make_importer_page (SWData *data) page->page = glade_xml_get_widget (data->wizard, "import-page"); g_return_val_if_fail (page->page != NULL, NULL); - gtk_signal_connect (GTK_OBJECT (page->page), "prepare", - GTK_SIGNAL_FUNC (prepare_importer_page), data); + g_signal_connect (page->page, "prepare", + G_CALLBACK (prepare_importer_page), data); page->vbox = GNOME_DRUID_PAGE_STANDARD (page->page)->vbox; gtk_container_set_border_width (GTK_CONTAINER (page->vbox), 4); @@ -830,7 +830,7 @@ startup_wizard_cancel (GnomeDruid *druid, if (data->timezone_page->etd != NULL) { /* Need to do this otherwise the timezone widget gets destroyed but the timezone object isn't, and we can get a crash like #22047. */ - gtk_object_unref (GTK_OBJECT (data->timezone_page->etd)); + g_object_unref (data->timezone_page->etd); data->timezone_page->etd = NULL; } @@ -869,15 +869,15 @@ e_shell_startup_wizard_create (void) gnome_druid_set_buttons_sensitive (GNOME_DRUID (data->druid), FALSE, TRUE, FALSE, FALSE); - gtk_signal_connect (GTK_OBJECT (data->druid), "cancel", - GTK_SIGNAL_FUNC (startup_wizard_cancel), data); + g_signal_connect (data->druid, "cancel", + G_CALLBACK (startup_wizard_cancel), data); data->start = glade_xml_get_widget (data->wizard, "start-page"); data->finish = glade_xml_get_widget (data->wizard, "done-page"); g_return_val_if_fail (data->start != NULL, FALSE); g_return_val_if_fail (data->finish != NULL, FALSE); - gtk_signal_connect (GTK_OBJECT (data->finish), "finish", - GTK_SIGNAL_FUNC (finish_func), data); + g_signal_connect (data->finish, "finish", + G_CALLBACK (finish_func), data); make_mail_dialog_pages (data); g_return_val_if_fail (data->mailer != CORBA_OBJECT_NIL, TRUE); diff --git a/shell/e-shell-user-creatable-items-handler.c b/shell/e-shell-user-creatable-items-handler.c index 8f48cb2ccc..fd973d663d 100644 --- a/shell/e-shell-user-creatable-items-handler.c +++ b/shell/e-shell-user-creatable-items-handler.c @@ -106,7 +106,7 @@ component_new (const char *id, new = g_new (Component, 1); new->component_client = client; - gtk_object_ref (GTK_OBJECT (client)); + g_object_ref (client); CORBA_exception_init (&ev); @@ -124,7 +124,7 @@ component_new (const char *id, static void component_free (Component *component) { - gtk_object_unref (GTK_OBJECT (component->component_client)); + g_object_unref (component->component_client); if (component->type_list != NULL) CORBA_free (component->type_list); @@ -384,8 +384,8 @@ create_menu_xml (EShellUserCreatableItemsHandler *handler, g_string_append (xml, "<placeholder name=\"EShellUserCreatableItemsPlaceholder\">"); /* 1. Add all the elements that are default for this component. (Note - that we don't need to do any sorting since the items are already - sorted alphabetically.) */ + that we don't need to do any sorting since the items are already + sorted alphabetically.) */ if (component_id != NULL) { gboolean first = TRUE; @@ -581,9 +581,9 @@ setup_toolbar_button (EShellUserCreatableItemsHandler *handler, e_combo_button_set_label (E_COMBO_BUTTON (combo_button), _("New")); gtk_widget_show (combo_button); - gtk_signal_connect (GTK_OBJECT (combo_button), "activate_default", - GTK_SIGNAL_FUNC (combo_button_activate_default_callback), - shell_view); + g_signal_connect (combo_button, "activate_default", + G_CALLBACK (combo_button_activate_default_callback), + shell_view); ui_component = e_shell_view_get_bonobo_ui_component (shell_view); bonobo_window_add_popup (BONOBO_WINDOW (shell_view), GTK_MENU (menu), "/popups/NewPopup"); @@ -756,8 +756,8 @@ e_shell_user_creatable_items_handler_attach_menus (EShellUserCreatableItemsHandl priv = handler->priv; setup_toolbar_button (handler, shell_view); - gtk_signal_connect (GTK_OBJECT (shell_view), "view_changed", - GTK_SIGNAL_FUNC (shell_view_view_changed_callback), handler); + g_signal_connect (shell_view, "view_changed", + G_CALLBACK (shell_view_view_changed_callback), handler); add_verbs (handler, shell_view); menu_xml = create_menu_xml (handler, diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index c9d55883d9..208fd1c581 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -176,8 +176,8 @@ command_quit (BonoboUIComponent *uih, static void command_submit_bug (BonoboUIComponent *uih, - void *data, - const char *path) + void *data, + const char *path) { int pid; char *args[] = { @@ -234,12 +234,12 @@ command_about_box (BonoboUIComponent *uih, about_box_window = gtk_dialog_new (); gtk_window_set_policy (GTK_WINDOW (about_box_window), FALSE, FALSE, FALSE); - gtk_signal_connect (GTK_OBJECT (about_box_window), "key_press_event", - GTK_SIGNAL_FUNC (about_box_event_callback), &about_box_window); - gtk_signal_connect (GTK_OBJECT (about_box_window), "button_press_event", - GTK_SIGNAL_FUNC (about_box_event_callback), &about_box_window); - gtk_signal_connect (GTK_OBJECT (about_box_window), "delete_event", - GTK_SIGNAL_FUNC (about_box_event_callback), &about_box_window); + g_signal_connect (about_box_window, "key_press_event", + G_CALLBACK (about_box_event_callback), &about_box_window); + g_signal_connect (about_box_window, "button_press_event", + G_CALLBACK (about_box_event_callback), &about_box_window); + g_signal_connect (about_box_window, "delete_event", + G_CALLBACK (about_box_event_callback), &about_box_window); gtk_window_set_transient_for (GTK_WINDOW (about_box_window), GTK_WINDOW (data)); gtk_window_set_title (GTK_WINDOW (about_box_window), _("About Ximian Evolution")); @@ -504,10 +504,10 @@ command_goto_folder (BonoboUIComponent *uih, gtk_window_set_transient_for (GTK_WINDOW (folder_selection_dialog), GTK_WINDOW (shell_view)); - gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "cancelled", - GTK_SIGNAL_FUNC (goto_folder_dialog_cancelled_cb), shell_view); - gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "folder_selected", - GTK_SIGNAL_FUNC (goto_folder_dialog_folder_selected_cb), shell_view); + g_signal_connect (folder_selection_dialog, "cancelled", + G_CALLBACK (goto_folder_dialog_cancelled_cb), shell_view); + g_signal_connect (folder_selection_dialog, "folder_selected", + G_CALLBACK (goto_folder_dialog_folder_selected_cb), shell_view); gtk_widget_show (folder_selection_dialog); } @@ -619,10 +619,10 @@ command_new_shortcut (BonoboUIComponent *uih, e_shell_folder_selection_dialog_set_allow_creation (E_SHELL_FOLDER_SELECTION_DIALOG (folder_selection_dialog), FALSE); - gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "cancelled", - GTK_SIGNAL_FUNC (new_shortcut_dialog_cancelled_cb), shell_view); - gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "folder_selected", - GTK_SIGNAL_FUNC (new_shortcut_dialog_folder_selected_cb), shell_view); + g_signal_connect (folder_selection_dialog, "cancelled", + G_CALLBACK (new_shortcut_dialog_cancelled_cb), shell_view); + g_signal_connect (folder_selection_dialog, "folder_selected", + G_CALLBACK (new_shortcut_dialog_folder_selected_cb), shell_view); gtk_widget_show (folder_selection_dialog); } @@ -855,12 +855,12 @@ e_shell_view_menu_setup (EShellView *shell_view) e_pixmaps_update (uic, pixmaps); - gtk_signal_connect (GTK_OBJECT (shell_view), "shortcut_bar_visibility_changed", - GTK_SIGNAL_FUNC (shortcut_bar_visibility_changed_cb), - SHORTCUT_BAR_TOGGLE_PATH); - gtk_signal_connect (GTK_OBJECT (shell_view), "folder_bar_visibility_changed", - GTK_SIGNAL_FUNC (folder_bar_visibility_changed_cb), - FOLDER_BAR_TOGGLE_PATH); + g_signal_connect (shell_view, "shortcut_bar_visibility_changed", + G_CALLBACK (shortcut_bar_visibility_changed_cb), + SHORTCUT_BAR_TOGGLE_PATH); + g_signal_connect (shell_view, "folder_bar_visibility_changed", + G_CALLBACK (folder_bar_visibility_changed_cb), + FOLDER_BAR_TOGGLE_PATH); /* Initialize the toggles. Yeah, this is, well, yuck. */ folder_bar_visibility_changed_cb (shell_view, e_shell_view_folder_bar_shown (shell_view), @@ -869,8 +869,7 @@ e_shell_view_menu_setup (EShellView *shell_view) SHORTCUT_BAR_TOGGLE_PATH); /* Set up the work online / work offline menu item. */ - gtk_signal_connect_while_alive (GTK_OBJECT (shell), "line_status_changed", - GTK_SIGNAL_FUNC (shell_line_status_changed_cb), shell_view, - GTK_OBJECT (shell_view)); + g_signal_connect_object (shell, "line_status_changed", + G_CALLBACK (shell_line_status_changed_cb), shell_view, 0); update_offline_menu_item (shell_view, e_shell_get_line_status (shell)); } diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 671d166249..7bbbba93d4 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -739,8 +739,8 @@ pop_up_folder_bar (EShellView *shell_view) /* We need to show the storage set view box and do a pointer grab to catch the mouse clicks. But until the box is shown, we cannot grab. So we connect to the "map" signal; `storage_set_view_box_map_cb()' will do the grab. */ - gtk_signal_connect (GTK_OBJECT (priv->folder_bar_popup), "map", - GTK_SIGNAL_FUNC (folder_bar_popup_map_callback), shell_view); + g_signal_connect (priv->folder_bar_popup, "map", + G_CALLBACK (folder_bar_popup_map_callback), shell_view); x = priv->folder_title_bar->allocation.x; y = priv->folder_title_bar->allocation.y + priv->folder_title_bar->allocation.height; @@ -795,7 +795,7 @@ popdown_transient_folder_bar_idle (void *data) popdown_transient_folder_bar (shell_view); - gtk_object_unref (GTK_OBJECT (shell_view)); + g_object_unref (shell_view); return FALSE; } @@ -831,7 +831,7 @@ switch_on_folder_tree_click (EShellView *shell_view, e_shell_view_display_uri (shell_view, uri, TRUE); g_free (uri); - gtk_object_ref (GTK_OBJECT (shell_view)); + g_object_ref (shell_view); gtk_idle_add (popdown_transient_folder_bar_idle, shell_view); return; } @@ -1058,12 +1058,12 @@ setup_storage_set_subwindow (EShellView *shell_view) storage_set_view = e_storage_set_create_new_view (e_shell_get_storage_set (priv->shell), priv->ui_container); - gtk_signal_connect (GTK_OBJECT (storage_set_view), "folder_selected", - GTK_SIGNAL_FUNC (folder_selected_cb), shell_view); - gtk_signal_connect (GTK_OBJECT (storage_set_view), "folder_context_menu_popping_up", - GTK_SIGNAL_FUNC (folder_context_menu_popping_up_cb), shell_view); - gtk_signal_connect (GTK_OBJECT (storage_set_view), "folder_context_menu_popped_down", - GTK_SIGNAL_FUNC (folder_context_menu_popped_down_cb), shell_view); + g_signal_connect (storage_set_view, "folder_selected", + G_CALLBACK (folder_selected_cb), shell_view); + g_signal_connect (storage_set_view, "folder_context_menu_popping_up", + G_CALLBACK (folder_context_menu_popping_up_cb), shell_view); + g_signal_connect (storage_set_view, "folder_context_menu_popped_down", + G_CALLBACK (folder_context_menu_popped_down_cb), shell_view); scroll_frame = e_scroll_frame_new (NULL, NULL); e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame), @@ -1081,8 +1081,8 @@ setup_storage_set_subwindow (EShellView *shell_view) gtk_box_pack_start (GTK_BOX (vbox), priv->storage_set_title_bar, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), scroll_frame, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (priv->storage_set_title_bar), "button_clicked", - GTK_SIGNAL_FUNC (storage_set_view_button_clicked_cb), shell_view); + g_signal_connect (priv->storage_set_title_bar, "button_clicked", + G_CALLBACK (storage_set_view_button_clicked_cb), shell_view); gtk_widget_show (storage_set_view); gtk_widget_show (priv->storage_set_title_bar); @@ -1107,8 +1107,8 @@ setup_offline_toggle (EShellView *shell_view) GTK_WIDGET_UNSET_FLAGS (toggle, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (toggle), GTK_RELIEF_NONE); - gtk_signal_connect (GTK_OBJECT (toggle), "clicked", - GTK_SIGNAL_FUNC (offline_toggle_clicked_cb), shell_view); + g_signal_connect (toggle, "clicked", + G_CALLBACK (offline_toggle_clicked_cb), shell_view); pixmap = gtk_pixmap_new (offline_pixmap, offline_mask); @@ -1215,10 +1215,10 @@ setup_statusbar_hints (EShellView *shell_view) ui_engine = bonobo_window_get_ui_engine (BONOBO_WINDOW (shell_view)); - gtk_signal_connect (GTK_OBJECT (ui_engine), "add_hint", - GTK_SIGNAL_FUNC (ui_engine_add_hint_callback), shell_view); - gtk_signal_connect (GTK_OBJECT (ui_engine), "remove_hint", - GTK_SIGNAL_FUNC (ui_engine_remove_hint_callback), shell_view); + g_signal_connect (ui_engine, "add_hint", + G_CALLBACK (ui_engine_add_hint_callback), shell_view); + g_signal_connect (ui_engine, "remove_hint", + G_CALLBACK (ui_engine_remove_hint_callback), shell_view); } @@ -1234,11 +1234,11 @@ setup_widgets (EShellView *shell_view) /* The shortcut bar. */ priv->shortcut_bar = e_shortcuts_new_view (e_shell_get_shortcuts (priv->shell)); - gtk_signal_connect (GTK_OBJECT (priv->shortcut_bar), "activate_shortcut", - GTK_SIGNAL_FUNC (activate_shortcut_cb), shell_view); + g_signal_connect (priv->shortcut_bar, "activate_shortcut", + G_CALLBACK (activate_shortcut_cb), shell_view); - gtk_signal_connect (GTK_OBJECT (priv->shortcut_bar), "hide_requested", - GTK_SIGNAL_FUNC (hide_requested_cb), shell_view); + g_signal_connect (priv->shortcut_bar, "hide_requested", + G_CALLBACK (hide_requested_cb), shell_view); priv->shortcut_frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (priv->shortcut_frame), GTK_SHADOW_IN); @@ -1262,12 +1262,12 @@ setup_widgets (EShellView *shell_view) priv->view_vbox = gtk_vbox_new (FALSE, 0); priv->folder_title_bar = e_shell_folder_title_bar_new (); - gtk_signal_connect (GTK_OBJECT (priv->folder_title_bar), "title_toggled", - GTK_SIGNAL_FUNC (title_bar_toggled_cb), shell_view); - gtk_signal_connect (GTK_OBJECT (priv->folder_title_bar), "back_clicked", - GTK_SIGNAL_FUNC (back_clicked_callback), shell_view); - gtk_signal_connect (GTK_OBJECT (priv->folder_title_bar), "forward_clicked", - GTK_SIGNAL_FUNC (forward_clicked_callback), shell_view); + g_signal_connect (priv->folder_title_bar, "title_toggled", + G_CALLBACK (title_bar_toggled_cb), shell_view); + g_signal_connect (priv->folder_title_bar, "back_clicked", + G_CALLBACK (back_clicked_callback), shell_view); + g_signal_connect (priv->folder_title_bar, "forward_clicked", + G_CALLBACK (forward_clicked_callback), shell_view); priv->view_hpaned = e_hpaned_new (); e_paned_pack1 (E_PANED (priv->view_hpaned), priv->storage_set_view_box, FALSE, FALSE); @@ -1351,10 +1351,10 @@ destroy (GtkObject *object) storage set used for the delayed selection mechanism. */ cleanup_delayed_selection (shell_view); - gtk_object_unref (GTK_OBJECT (priv->tooltips)); + g_object_unref (priv->tooltips); if (priv->history != NULL) - gtk_object_unref (GTK_OBJECT (priv->history)); + g_object_unref (priv->history); if (priv->shell != NULL) bonobo_object_unref (BONOBO_OBJECT (priv->shell)); @@ -1497,9 +1497,9 @@ init (EShellView *shell_view) static void corba_interface_set_message_cb (EvolutionShellView *shell_view, - const char *message, - gboolean busy, - void *data) + const char *message, + gboolean busy, + void *data) { /* Don't do anything here anymore. The interface is going to be deprecated soon. */ @@ -1507,7 +1507,7 @@ corba_interface_set_message_cb (EvolutionShellView *shell_view, static void corba_interface_unset_message_cb (EvolutionShellView *shell_view, - void *data) + void *data) { /* Don't do anything here anymore. The interface is going to be deprecated soon. */ @@ -1515,8 +1515,8 @@ corba_interface_unset_message_cb (EvolutionShellView *shell_view, static void corba_interface_change_current_view_cb (EvolutionShellView *shell_view, - const char *uri, - void *data) + const char *uri, + void *data) { EShellView *view; @@ -1665,23 +1665,23 @@ e_shell_view_construct (EShellView *shell_view, "evolution", "Ximian Evolution")); if (!view) { - gtk_object_unref (GTK_OBJECT (shell_view)); + g_object_unref (shell_view); return NULL; } priv->shell = shell; bonobo_object_ref (BONOBO_OBJECT (priv->shell)); - gtk_signal_connect (GTK_OBJECT (view), "delete_event", - GTK_SIGNAL_FUNC (delete_event_cb), NULL); + g_signal_connect (view, "delete_event", + G_CALLBACK (delete_event_cb), NULL); gtk_signal_connect_while_alive (GTK_OBJECT (e_shell_get_storage_set (priv->shell)), - "updated_folder", GTK_SIGNAL_FUNC (updated_folder_cb), + "updated_folder", G_CALLBACK (updated_folder_cb), shell_view, GTK_OBJECT (shell_view)); priv->ui_container = bonobo_window_get_ui_container (BONOBO_WINDOW (view)); - gtk_signal_connect (GTK_OBJECT (priv->ui_container), "system_exception", - GTK_SIGNAL_FUNC (unmerge_on_error), NULL); + g_signal_connect (priv->ui_container, "system_exception", + G_CALLBACK (unmerge_on_error), NULL); priv->ui_component = bonobo_ui_component_new ("evolution"); bonobo_ui_component_set_container (priv->ui_component, @@ -1702,13 +1702,11 @@ e_shell_view_construct (EShellView *shell_view, bonobo_ui_component_thaw (priv->ui_component, NULL); - gtk_signal_connect_while_alive (GTK_OBJECT (shell), "line_status_changed", - GTK_SIGNAL_FUNC (shell_line_status_changed_cb), shell_view, - GTK_OBJECT (shell_view)); + g_signal_connect_object (shell, "line_status_changed", + G_CALLBACK (shell_line_status_changed_cb), shell_view, 0); - gtk_signal_connect_while_alive (GTK_OBJECT (e_shell_get_storage_set (shell)), "removed_folder", - GTK_SIGNAL_FUNC (storage_set_removed_folder_callback), shell_view, - GTK_OBJECT (shell_view)); + g_signal_connect_object (GTK_OBJECT (e_shell_get_storage_set (shell)), "removed_folder", + G_CALLBACK (storage_set_removed_folder_callback), shell_view, 0); e_shell_user_creatable_items_handler_attach_menus (e_shell_get_user_creatable_items_handler (priv->shell), shell_view); @@ -1863,7 +1861,7 @@ update_for_current_uri (EShellView *shell_view) priv = shell_view->priv; /* If we update when there is a timeout set, the selection will jump - around against the user's wishes. So we just return. */ + around against the user's wishes. So we just return. */ if (priv->set_folder_timeout != 0) return; @@ -1907,14 +1905,14 @@ update_for_current_uri (EShellView *shell_view) g_free (title); gtk_signal_handler_block_by_func (GTK_OBJECT (priv->storage_set_view), - GTK_SIGNAL_FUNC (folder_selected_cb), + G_CALLBACK (folder_selected_cb), shell_view); if (path != NULL) e_storage_set_view_set_current_folder (E_STORAGE_SET_VIEW (priv->storage_set_view), path); gtk_signal_handler_unblock_by_func (GTK_OBJECT (priv->storage_set_view), - GTK_SIGNAL_FUNC (folder_selected_cb), + G_CALLBACK (folder_selected_cb), shell_view); } @@ -2016,24 +2014,18 @@ setup_corba_interface (EShellView *shell_view, control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (control)); corba_interface = evolution_shell_view_new (); - gtk_signal_connect_while_alive (GTK_OBJECT (corba_interface), "set_message", - GTK_SIGNAL_FUNC (corba_interface_set_message_cb), - shell_view, GTK_OBJECT (shell_view)); - gtk_signal_connect_while_alive (GTK_OBJECT (corba_interface), "unset_message", - GTK_SIGNAL_FUNC (corba_interface_unset_message_cb), - shell_view, GTK_OBJECT (shell_view)); - gtk_signal_connect_while_alive (GTK_OBJECT (corba_interface), "change_current_view", - GTK_SIGNAL_FUNC (corba_interface_change_current_view_cb), - shell_view, GTK_OBJECT (shell_view)); - gtk_signal_connect_while_alive (GTK_OBJECT (corba_interface), "set_title", - GTK_SIGNAL_FUNC (corba_interface_set_title), - shell_view, GTK_OBJECT (shell_view)); - gtk_signal_connect_while_alive (GTK_OBJECT (corba_interface), "set_folder_bar_label", - GTK_SIGNAL_FUNC (corba_interface_set_folder_bar_label), - shell_view, GTK_OBJECT (shell_view)); - gtk_signal_connect_while_alive (GTK_OBJECT (corba_interface), "show_settings", - GTK_SIGNAL_FUNC (corba_interface_show_settings), - shell_view, GTK_OBJECT (shell_view)); + g_signal_connect_object (corba_interface, "set_message", + G_CALLBACK (corba_interface_set_message_cb), shell_view, 0); + g_signal_connect_object (corba_interface, "unset_message", + G_CALLBACK (corba_interface_unset_message_cb), shell_view, 0); + g_signal_connect_object (corba_interface, "change_current_view", + G_CALLBACK (corba_interface_change_current_view_cb), shell_view, 0); + g_signal_connect_object (corba_interface, "set_title", + G_CALLBACK (corba_interface_set_title), shell_view, 0); + g_signal_connect_object (corba_interface, "set_folder_bar_label", + G_CALLBACK (corba_interface_set_folder_bar_label), shell_view, 0); + g_signal_connect_object (corba_interface, "show_settings", + G_CALLBACK (corba_interface_show_settings), shell_view, 0); bonobo_object_add_interface (BONOBO_OBJECT (control_frame), BONOBO_OBJECT (corba_interface)); @@ -2188,9 +2180,9 @@ get_view_for_uri (EShellView *shell_view, control = bonobo_widget_new_control_from_objref (corba_control, container); socket = find_socket (GTK_CONTAINER (control)); - destroy_connection_id = gtk_signal_connect (GTK_OBJECT (socket), "destroy", - GTK_SIGNAL_FUNC (socket_destroy_cb), - shell_view); + destroy_connection_id = g_signal_connect (socket, "destroy", + G_CALLBACK (socket_destroy_cb), + shell_view); gtk_object_set_data (GTK_OBJECT (socket), "e_shell_view_destroy_connection_id", GINT_TO_POINTER (destroy_connection_id)); @@ -2341,7 +2333,7 @@ display_uri (EShellView *shell_view, cleanup_delayed_selection (shell_view); priv->delayed_selection = g_strdup (real_uri); gtk_signal_connect_full (GTK_OBJECT (e_shell_get_storage_set (priv->shell)), - "new_folder", GTK_SIGNAL_FUNC (new_folder_cb), NULL, + "new_folder", G_CALLBACK (new_folder_cb), NULL, shell_view, NULL, FALSE, TRUE); retval = TRUE; goto end; diff --git a/shell/e-shell.c b/shell/e-shell.c index 76a23b4269..fb4be8a108 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -538,10 +538,10 @@ impl_Shell_selectUserFolder (PortableServer_Servant servant, gtk_object_set_data_full (GTK_OBJECT (folder_selection_dialog), "corba_listener", listener_duplicate, corba_listener_destroy_notify); - gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "folder_selected", - GTK_SIGNAL_FUNC (folder_selection_dialog_folder_selected_cb), shell); - gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "cancelled", - GTK_SIGNAL_FUNC (folder_selection_dialog_cancelled_cb), shell); + g_signal_connect (folder_selection_dialog, "folder_selected", + G_CALLBACK (folder_selection_dialog_folder_selected_cb), shell); + g_signal_connect (folder_selection_dialog, "cancelled", + G_CALLBACK (folder_selection_dialog_cancelled_cb), shell); if (parent_xid == 0) { gtk_widget_show (folder_selection_dialog); @@ -998,10 +998,10 @@ create_view (EShell *shell, view = e_shell_view_new (shell); - gtk_signal_connect (GTK_OBJECT (view), "delete_event", - GTK_SIGNAL_FUNC (view_delete_event_cb), shell); - gtk_signal_connect (GTK_OBJECT (view), "destroy", - GTK_SIGNAL_FUNC (view_destroy_cb), shell); + g_signal_connect (view, "delete_event", + G_CALLBACK (view_delete_event_cb), shell); + g_signal_connect (view, "destroy", + G_CALLBACK (view_destroy_cb), shell); if (uri != NULL) e_shell_view_display_uri (E_SHELL_VIEW (view), uri, TRUE); @@ -1042,30 +1042,30 @@ impl_finalize (GObject *object) g_free (priv->local_directory); if (priv->storage_set != NULL) { - gtk_object_unref (GTK_OBJECT (priv->storage_set)); + g_object_unref (priv->storage_set); priv->storage_set = NULL; } if (priv->local_storage != NULL) - gtk_object_unref (GTK_OBJECT (priv->local_storage)); + g_object_unref (priv->local_storage); if (priv->summary_storage != NULL) - gtk_object_unref (GTK_OBJECT (priv->summary_storage)); + g_object_unref (priv->summary_storage); if (priv->shortcuts != NULL) - gtk_object_unref (GTK_OBJECT (priv->shortcuts)); + g_object_unref (priv->shortcuts); if (priv->folder_type_registry != NULL) - gtk_object_unref (GTK_OBJECT (priv->folder_type_registry)); + g_object_unref (priv->folder_type_registry); if (priv->uri_schema_registry != NULL) - gtk_object_unref (GTK_OBJECT (priv->uri_schema_registry)); + g_object_unref (priv->uri_schema_registry); if (priv->component_registry != NULL) - gtk_object_unref (GTK_OBJECT (priv->component_registry)); + g_object_unref (priv->component_registry); if (priv->user_creatable_items_handler != NULL) - gtk_object_unref (GTK_OBJECT (priv->user_creatable_items_handler)); + g_object_unref (priv->user_creatable_items_handler); for (p = priv->views; p != NULL; p = p->next) { EShellView *view; @@ -1073,10 +1073,10 @@ impl_finalize (GObject *object) view = E_SHELL_VIEW (p->data); gtk_signal_disconnect_by_func (GTK_OBJECT (view), - GTK_SIGNAL_FUNC (view_delete_event_cb), + G_CALLBACK (view_delete_event_cb), shell); gtk_signal_disconnect_by_func (GTK_OBJECT (view), - GTK_SIGNAL_FUNC (view_destroy_cb), + G_CALLBACK (view_destroy_cb), shell); gtk_object_destroy (GTK_OBJECT (view)); @@ -1091,7 +1091,7 @@ impl_finalize (GObject *object) /* FIXME. Maybe we should do something special here. */ if (priv->offline_handler != NULL) - gtk_object_unref (GTK_OBJECT (priv->offline_handler)); + g_object_unref (priv->offline_handler); e_free_string_list (priv->crash_type_names); @@ -1272,8 +1272,8 @@ e_shell_construct (EShell *shell, splash = NULL; } else { splash = e_splash_new (); - gtk_signal_connect (GTK_OBJECT (splash), "delete_event", - GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete), NULL); + g_signal_connect (splash, "delete_event", + G_CALLBACK (gtk_widget_hide_on_delete), NULL); gtk_widget_show (splash); } @@ -1900,7 +1900,7 @@ offline_procedure_finished_cb (EShellOfflineHandler *offline_handler, else priv->line_status = E_SHELL_LINE_STATUS_ONLINE; - gtk_object_unref (GTK_OBJECT (priv->offline_handler)); + g_object_unref (priv->offline_handler); priv->offline_handler = NULL; gtk_signal_emit (GTK_OBJECT (shell), signals[LINE_STATUS_CHANGED], priv->line_status); @@ -1950,10 +1950,10 @@ e_shell_go_offline (EShell *shell, priv->offline_handler = e_shell_offline_handler_new (shell); - gtk_signal_connect (GTK_OBJECT (priv->offline_handler), "offline_procedure_started", - GTK_SIGNAL_FUNC (offline_procedure_started_cb), shell); - gtk_signal_connect (GTK_OBJECT (priv->offline_handler), "offline_procedure_finished", - GTK_SIGNAL_FUNC (offline_procedure_finished_cb), shell); + g_signal_connect (priv->offline_handler, "offline_procedure_started", + G_CALLBACK (offline_procedure_started_cb), shell); + g_signal_connect (priv->offline_handler, "offline_procedure_finished", + G_CALLBACK (offline_procedure_finished_cb), shell); e_shell_offline_handler_put_components_offline (priv->offline_handler, action_view); } @@ -2080,8 +2080,8 @@ e_shell_show_settings (EShell *shell, const char *type, EShellView *shell_view) priv->settings_dialog = e_shell_settings_dialog_new (); e_shell_settings_dialog_show_type (E_SHELL_SETTINGS_DIALOG (priv->settings_dialog), type); - gtk_signal_connect (GTK_OBJECT (priv->settings_dialog), "destroy", - GTK_SIGNAL_FUNC (settings_dialog_destroy_cb), shell); + g_signal_connect (priv->settings_dialog, "destroy", + G_CALLBACK (settings_dialog_destroy_cb), shell); gtk_widget_show (priv->settings_dialog); } @@ -2129,7 +2129,7 @@ e_shell_unregister_all (EShell *shell) priv->is_initialized = FALSE; - gtk_object_unref (GTK_OBJECT (priv->component_registry)); + g_object_unref (priv->component_registry); priv->component_registry = NULL; } diff --git a/shell/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c index ddfa12f805..86ff02158a 100644 --- a/shell/e-shortcuts-view-model.c +++ b/shell/e-shortcuts-view-model.c @@ -315,24 +315,12 @@ e_shortcuts_view_model_construct (EShortcutsViewModel *model, load_all_shortcuts_into_model (model); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "new_group", GTK_SIGNAL_FUNC (shortcuts_new_group_cb), model, - GTK_OBJECT (model)); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "remove_group", GTK_SIGNAL_FUNC (shortcuts_remove_group_cb), model, - GTK_OBJECT (model)); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "rename_group", GTK_SIGNAL_FUNC (shortcuts_rename_group_cb), model, - GTK_OBJECT (model)); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "new_shortcut", GTK_SIGNAL_FUNC (shortcuts_new_shortcut_cb), model, - GTK_OBJECT (model)); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "remove_shortcut", GTK_SIGNAL_FUNC (shortcuts_remove_shortcut_cb), model, - GTK_OBJECT (model)); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "update_shortcut", GTK_SIGNAL_FUNC (shortcuts_update_shortcut_cb), model, - GTK_OBJECT (model)); + g_signal_connect_object (priv->shortcuts, "new_group", G_CALLBACK (shortcuts_new_group_cb), model, 0); + g_signal_connect_object (priv->shortcuts, "remove_group", G_CALLBACK (shortcuts_remove_group_cb), model, 0); + g_signal_connect_object (priv->shortcuts, "rename_group", G_CALLBACK (shortcuts_rename_group_cb), model, 0); + g_signal_connect_object (priv->shortcuts, "new_shortcut", G_CALLBACK (shortcuts_new_shortcut_cb), model, 0); + g_signal_connect_object (priv->shortcuts, "remove_shortcut", G_CALLBACK (shortcuts_remove_shortcut_cb), model, 0); + g_signal_connect_object (priv->shortcuts, "update_shortcut", G_CALLBACK (shortcuts_update_shortcut_cb), model, 0); } EShortcutsViewModel * diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c index 51961afae6..779a5c55be 100644 --- a/shell/e-shortcuts-view.c +++ b/shell/e-shortcuts-view.c @@ -475,7 +475,7 @@ destroy (GtkObject *object) priv = shortcuts_view->priv; - gtk_object_unref (GTK_OBJECT (priv->shortcuts)); + g_object_unref (priv->shortcuts); g_free (priv); @@ -738,14 +738,13 @@ e_shortcuts_view_construct (EShortcutsView *shortcuts_view, priv = shortcuts_view->priv; priv->shortcuts = shortcuts; - gtk_object_ref (GTK_OBJECT (priv->shortcuts)); + g_object_ref (priv->shortcuts); e_shortcut_bar_set_model (E_SHORTCUT_BAR (shortcuts_view), E_SHORTCUT_MODEL (e_shortcuts_view_model_new (shortcuts))); - gtk_signal_connect_while_alive (GTK_OBJECT (shortcuts), "group_change_icon_size", - GTK_SIGNAL_FUNC (group_change_icon_size_callback), - shortcuts_view, GTK_OBJECT (shortcuts_view)); + g_signal_connect_object (shortcuts, "group_change_icon_size", + G_CALLBACK (group_change_icon_size_callback), shortcuts_view, 0); num_groups = e_shortcuts_get_num_groups (shortcuts); for (i = 0; i < num_groups; i ++) { diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index ee07e3ebd8..efa0ce01f9 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -764,12 +764,10 @@ e_shortcuts_construct (EShortcuts *shortcuts, storage_set = e_shell_get_storage_set (shell); - gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "new_folder", - GTK_SIGNAL_FUNC (storage_set_new_folder_callback), - shortcuts, GTK_OBJECT (shortcuts)); - gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "updated_folder", - GTK_SIGNAL_FUNC (storage_set_updated_folder_callback), - shortcuts, GTK_OBJECT (shortcuts)); + g_signal_connect_object (storage_set, "new_folder", + G_CALLBACK (storage_set_new_folder_callback), shortcuts, 0); + g_signal_connect_object (storage_set, "updated_folder", + G_CALLBACK (storage_set_updated_folder_callback), shortcuts, 0); } EShortcuts * diff --git a/shell/e-splash.c b/shell/e-splash.c index dc752deca4..cb75d35423 100644 --- a/shell/e-splash.c +++ b/shell/e-splash.c @@ -139,7 +139,8 @@ icon_free (Icon *icon) { gdk_pixbuf_unref (icon->dark_pixbuf); gdk_pixbuf_unref (icon->light_pixbuf); -/* gtk_object_unref (GTK_OBJECT (icon->canvas_item)); */ + +/* g_object_unref (icon->canvas_item); */ g_free (icon); } @@ -206,10 +207,10 @@ schedule_relayout (ESplash *splash) } -/* GtkObject methods. */ +/* GObject methods. */ static void -impl_destroy (GtkObject *object) +impl_finalize (GObject *object) { ESplash *splash; ESplashPrivate *priv; @@ -235,17 +236,17 @@ impl_destroy (GtkObject *object) g_free (priv); - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } static void class_init (ESplashClass *klass) { - 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; parent_class = gtk_type_class (gtk_window_get_type ()); } @@ -325,8 +326,8 @@ e_splash_construct (ESplash *splash, "pixbuf", splash_image_pixbuf, NULL); - gtk_signal_connect (GTK_OBJECT (splash), "button-press-event", - GTK_SIGNAL_FUNC (button_press_event), splash); + g_signal_connect (splash, "button-press-event", + G_CALLBACK (button_press_event), splash); gtk_object_set (GTK_OBJECT (splash), "type", GTK_WINDOW_TOPLEVEL, NULL); gtk_window_set_position (GTK_WINDOW (splash), GTK_WIN_POS_CENTER); @@ -357,7 +358,7 @@ e_splash_new (void) new = gtk_type_new (e_splash_get_type ()); e_splash_construct (new, splash_image_pixbuf); - gdk_pixbuf_unref (splash_image_pixbuf); + /* gdk_pixbuf_unref (splash_image_pixbuf); */ return GTK_WIDGET (new); } diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index a68c10b83f..2b093e19fd 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -692,8 +692,8 @@ setup_folder_properties_items_if_corba_storage_clicked (EStorageSetView *storage data->corba_storage = E_CORBA_STORAGE (storage); data->num_items = num_property_items; - gtk_object_ref (GTK_OBJECT (data->storage_set_view)); - gtk_object_ref (GTK_OBJECT (data->corba_storage)); + g_object_ref (data->storage_set_view); + g_object_ref (data->corba_storage); for (i = 1; i <= num_property_items; i ++) { char *verb; @@ -741,8 +741,8 @@ remove_property_items (EStorageSetView *storage_set_view, } } - gtk_object_unref (GTK_OBJECT (data->storage_set_view)); - gtk_object_unref (GTK_OBJECT (data->corba_storage)); + g_object_unref (data->storage_set_view); + g_object_unref (data->corba_storage); g_free (data); } @@ -761,7 +761,7 @@ popup_folder_menu (EStorageSetView *storage_set_view, priv = storage_set_view->priv; folder = e_storage_set_get_folder (priv->storage_set, priv->right_click_row_path); - gtk_object_ref (GTK_OBJECT (folder)); + g_object_ref (folder); folder_type_registry = e_storage_set_get_folder_type_registry (priv->storage_set); g_assert (folder_type_registry != NULL); @@ -801,7 +801,7 @@ popup_folder_menu (EStorageSetView *storage_set_view, e_folder_get_physical_uri (folder), e_folder_get_type_string (folder)); - gtk_object_unref (GTK_OBJECT (folder)); + g_object_unref (folder); gtk_widget_destroy (GTK_WIDGET (menu)); e_tree_right_click_up (E_TREE (storage_set_view)); @@ -828,7 +828,7 @@ impl_destroy (GtkObject *object) /* need to destroy our tree */ e_tree_memory_node_remove (E_TREE_MEMORY(priv->etree_model), priv->root_node); - gtk_object_unref (GTK_OBJECT (priv->etree_model)); + g_object_unref (priv->etree_model); /* the data in the hash table was all freed by freeing the tree */ g_hash_table_destroy (priv->path_to_etree_node); @@ -844,7 +844,7 @@ impl_destroy (GtkObject *object) priv->checkboxes = NULL; } - gtk_object_unref (GTK_OBJECT (priv->storage_set)); + g_object_unref (priv->storage_set); if (priv->drag_corba_source_interface != CORBA_OBJECT_NIL) { CORBA_Environment ev; @@ -2138,35 +2138,21 @@ e_storage_set_view_construct (EStorageSetView *storage_set_view, e_tree_root_node_set_visible (E_TREE(storage_set_view), FALSE); - gtk_object_unref (GTK_OBJECT (extras)); + g_object_unref (extras); - gtk_object_ref (GTK_OBJECT (storage_set)); + g_object_ref (storage_set); priv->storage_set = storage_set; e_tree_drag_dest_set (E_TREE (storage_set_view), 0, NULL, 0, GDK_ACTION_MOVE | GDK_ACTION_COPY); - gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "new_storage", - GTK_SIGNAL_FUNC (new_storage_cb), storage_set_view, - GTK_OBJECT (storage_set_view)); - gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "removed_storage", - GTK_SIGNAL_FUNC (removed_storage_cb), storage_set_view, - GTK_OBJECT (storage_set_view)); - gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "new_folder", - GTK_SIGNAL_FUNC (new_folder_cb), storage_set_view, - GTK_OBJECT (storage_set_view)); - gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "updated_folder", - GTK_SIGNAL_FUNC (updated_folder_cb), storage_set_view, - GTK_OBJECT (storage_set_view)); - gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "removed_folder", - GTK_SIGNAL_FUNC (removed_folder_cb), storage_set_view, - GTK_OBJECT (storage_set_view)); - gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "close_folder", - GTK_SIGNAL_FUNC (close_folder_cb), storage_set_view, - GTK_OBJECT (storage_set_view)); + g_signal_connect_object (storage_set, "new_storage", G_CALLBACK (new_storage_cb), storage_set_view, 0); + g_signal_connect_object (storage_set, "removed_storage", G_CALLBACK (removed_storage_cb), storage_set_view, 0); + g_signal_connect_object (storage_set, "new_folder", G_CALLBACK (new_folder_cb), storage_set_view, 0); + g_signal_connect_object (storage_set, "updated_folder", G_CALLBACK (updated_folder_cb), storage_set_view, 0); + g_signal_connect_object (storage_set, "removed_folder", G_CALLBACK (removed_folder_cb), storage_set_view, 0); + g_signal_connect_object (storage_set, "close_folder", G_CALLBACK (close_folder_cb), storage_set_view, 0); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->etree_model), "fill_in_children", - GTK_SIGNAL_FUNC (etree_fill_in_children), storage_set_view, - GTK_OBJECT (storage_set_view)); + g_signal_connect_object (priv->etree_model, "fill_in_children", G_CALLBACK (etree_fill_in_children), storage_set_view, 0); insert_storages (storage_set_view); } diff --git a/shell/e-storage-set.c b/shell/e-storage-set.c index 9d3b804b77..d6b4ea1366 100644 --- a/shell/e-storage-set.c +++ b/shell/e-storage-set.c @@ -348,7 +348,7 @@ destroy (GtkObject *object) e_free_object_list (priv->storages); - gtk_object_unref (GTK_OBJECT (priv->folder_type_registry)); + g_object_unref (priv->folder_type_registry); g_hash_table_foreach (priv->name_to_named_storage, (GHFunc) name_to_named_storage_foreach_destroy, NULL); @@ -454,7 +454,7 @@ e_storage_set_construct (EStorageSet *storage_set, GTK_OBJECT_UNSET_FLAGS (storage_set, GTK_FLOATING); - gtk_object_ref (GTK_OBJECT (folder_type_registry)); + g_object_ref (folder_type_registry); storage_set->priv->folder_type_registry = folder_type_registry; } @@ -485,7 +485,7 @@ e_storage_set_get_storage_list (EStorageSet *storage_set) list = NULL; for (p = priv->storages; p != NULL; p = p->next) { - gtk_object_ref (GTK_OBJECT (p->data)); + g_object_ref (p->data); list = g_list_prepend (list, p->data); } @@ -518,16 +518,16 @@ e_storage_set_add_storage (EStorageSet *storage_set, if (g_hash_table_lookup (priv->name_to_named_storage, storage_name) != NULL) return FALSE; - gtk_object_ref (GTK_OBJECT (storage)); + g_object_ref (storage); - gtk_signal_connect (GTK_OBJECT (storage), "new_folder", - GTK_SIGNAL_FUNC (storage_new_folder_cb), storage_set); - gtk_signal_connect (GTK_OBJECT (storage), "updated_folder", - GTK_SIGNAL_FUNC (storage_updated_folder_cb), storage_set); - gtk_signal_connect (GTK_OBJECT (storage), "removed_folder", - GTK_SIGNAL_FUNC (storage_removed_folder_cb), storage_set); - gtk_signal_connect (GTK_OBJECT (storage), "close_folder", - GTK_SIGNAL_FUNC (storage_close_folder_cb), storage_set); + g_signal_connect (storage, "new_folder", + G_CALLBACK (storage_new_folder_cb), storage_set); + g_signal_connect (storage, "updated_folder", + G_CALLBACK (storage_updated_folder_cb), storage_set); + g_signal_connect (storage, "removed_folder", + G_CALLBACK (storage_removed_folder_cb), storage_set); + g_signal_connect (storage, "close_folder", + G_CALLBACK (storage_close_folder_cb), storage_set); priv->storages = g_list_append (priv->storages, storage); @@ -566,7 +566,7 @@ e_storage_set_remove_storage (EStorageSet *storage_set, priv->storages = g_list_remove (priv->storages, storage); gtk_signal_emit (GTK_OBJECT (storage_set), signals[REMOVED_STORAGE], storage); - gtk_object_unref (GTK_OBJECT (storage)); + g_object_unref (storage); return TRUE; } @@ -588,7 +588,7 @@ e_storage_set_remove_all_storages (EStorageSet *storage_set) storage = E_STORAGE (p->data); gtk_signal_emit (GTK_OBJECT (storage_set), signals[REMOVED_STORAGE], storage); - gtk_object_unref (GTK_OBJECT (storage)); + g_object_unref (storage); } g_hash_table_foreach_remove (priv->name_to_named_storage, @@ -665,9 +665,9 @@ e_storage_set_create_new_view (EStorageSet *storage_set, g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL); storage_set_view = e_storage_set_view_new (storage_set, ui_container); - gtk_signal_connect (GTK_OBJECT (storage_set_view), "folder_opened", - GTK_SIGNAL_FUNC (storage_set_view_folder_opened), - storage_set); + g_signal_connect (storage_set_view, "folder_opened", + G_CALLBACK (storage_set_view_folder_opened), + storage_set); return storage_set_view; } diff --git a/shell/e-storage.c b/shell/e-storage.c index f1cdb26036..c9af5445b2 100644 --- a/shell/e-storage.c +++ b/shell/e-storage.c @@ -87,7 +87,7 @@ folder_destroy_notify (EFolderTree *tree, } e_folder = E_FOLDER (data); - gtk_object_unref (GTK_OBJECT (e_folder)); + g_object_unref (e_folder); } @@ -710,9 +710,7 @@ e_storage_new_folder (EStorage *storage, } g_free (parent_path); - gtk_signal_connect_while_alive (GTK_OBJECT (e_folder), "changed", - GTK_SIGNAL_FUNC (folder_changed_cb), storage, - GTK_OBJECT (storage)); + g_signal_connect_object (e_folder, "changed", G_CALLBACK (folder_changed_cb), storage, 0); gtk_signal_emit (GTK_OBJECT (storage), signals[NEW_FOLDER], path); diff --git a/shell/e-task-widget.c b/shell/e-task-widget.c index 2cb08d6c96..e8ea253595 100644 --- a/shell/e-task-widget.c +++ b/shell/e-task-widget.c @@ -66,7 +66,7 @@ impl_destroy (GtkObject *object) g_free (priv->component_id); - gtk_object_unref (GTK_OBJECT (priv->tooltips)); + g_object_unref (priv->tooltips); gdk_pixbuf_unref (priv->icon_pixbuf); diff --git a/shell/evolution-activity-client.c b/shell/evolution-activity-client.c index b5babd2780..29bfd2226a 100644 --- a/shell/evolution-activity-client.c +++ b/shell/evolution-activity-client.c @@ -332,7 +332,7 @@ evolution_activity_client_new (EvolutionShellClient *shell_client, information, cancellable, suggest_display_return)) { - gtk_object_unref (GTK_OBJECT (activity_client)); + g_object_unref (activity_client); return NULL; } diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c index 37845bcb80..a803880772 100644 --- a/shell/evolution-config-control.c +++ b/shell/evolution-config-control.c @@ -50,10 +50,10 @@ enum { static int signals[LAST_SIGNAL] = { 0 }; -/* GtkObject methods. */ +/* GObject methods. */ static void -impl_destroy (GtkObject *object) +impl_finalize (GObject *object) { EvolutionConfigControl *config_control; EvolutionConfigControlPrivate *priv; @@ -69,7 +69,7 @@ impl_destroy (GtkObject *object) config_control->priv = NULL; } - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -85,7 +85,7 @@ impl_apply (PortableServer_Servant servant, config_control = EVOLUTION_CONFIG_CONTROL (bonobo_object_from_servant (servant)); priv = config_control->priv; - gtk_signal_emit (GTK_OBJECT (config_control), signals[APPLY]); + g_signal_emit (GTK_OBJECT (config_control), signals[APPLY], 0); priv->changed = FALSE; } @@ -125,10 +125,10 @@ static void class_init (EvolutionConfigControlClass *class) { POA_GNOME_Evolution_ConfigControl__epv *epv; - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = GTK_OBJECT_CLASS (class); - object_class->destroy = impl_destroy; + object_class = G_OBJECT_CLASS (class); + object_class->finalize = impl_finalize; epv = &class->epv; epv->apply = impl_apply; @@ -179,7 +179,7 @@ evolution_config_control_new (GtkWidget *widget) g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); - new = gtk_type_new (evolution_config_control_get_type ()); + new = g_object_new (evolution_config_control_get_type (), NULL); evolution_config_control_construct (new, widget); return new; diff --git a/shell/evolution-folder-selector-button.c b/shell/evolution-folder-selector-button.c index b4fc4493b4..26a119e449 100644 --- a/shell/evolution-folder-selector-button.c +++ b/shell/evolution-folder-selector-button.c @@ -149,7 +149,7 @@ clicked (GtkButton *button) GTK_TYPE_WINDOW); gtk_widget_set_sensitive (GTK_WIDGET (parent_window), FALSE); - gtk_object_ref (GTK_OBJECT (parent_window)); + g_object_ref (parent_window); folder_selector_button = EVOLUTION_FOLDER_SELECTOR_BUTTON (button); priv = folder_selector_button->priv; @@ -176,13 +176,13 @@ clicked (GtkButton *button) * to just bail out here. */ if (GTK_OBJECT_DESTROYED (parent_window)) { - gtk_object_unref (GTK_OBJECT (parent_window)); + g_object_unref (parent_window); return; } #endif gtk_widget_set_sensitive (GTK_WIDGET (parent_window), TRUE); - gtk_object_unref (GTK_OBJECT (parent_window)); + g_object_unref (parent_window); if (!return_folder) { gtk_signal_emit (GTK_OBJECT (folder_selector_button), diff --git a/shell/evolution-session.c b/shell/evolution-session.c index 01603f993a..c74e071a00 100644 --- a/shell/evolution-session.c +++ b/shell/evolution-session.c @@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* evolution-session.c * - * Copyright (C) 2000 Ximian, Inc. + * Copyright (C) 2000, 2001, 2002 Ximian, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -48,10 +48,10 @@ enum { static int signals[LAST_SIGNAL]; -/* GtkObject methods. */ +/* GObject methods. */ static void -impl_destroy (GtkObject *object) +impl_finalize (GObject *object) { EvolutionSession *session; EvolutionSessionPrivate *priv; @@ -61,7 +61,7 @@ impl_destroy (GtkObject *object) g_free (priv); - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -75,7 +75,7 @@ impl_GNOME_Evolution_Session_saveConfiguration (PortableServer_Servant servant, BonoboObject *self; self = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (self), signals[SAVE_CONFIGURATION], prefix); + g_signal_emit (self, signals[SAVE_CONFIGURATION], 0, prefix); } static void @@ -86,7 +86,7 @@ impl_GNOME_Evolution_Session_loadConfiguration (PortableServer_Servant servant, BonoboObject *self; self = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (self), signals[LOAD_CONFIGURATION], prefix); + g_signal_emit (self, signals[LOAD_CONFIGURATION], 0, prefix); } @@ -105,12 +105,12 @@ corba_class_init (EvolutionSessionClass *klass) static void class_init (EvolutionSessionClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = GTK_OBJECT_CLASS (klass); + object_class = G_OBJECT_CLASS (klass); parent_class = gtk_type_class (PARENT_TYPE); - object_class->destroy = impl_destroy; + object_class->finalize = impl_finalize; signals[LOAD_CONFIGURATION] = gtk_signal_new ("load_configuration", @@ -146,7 +146,7 @@ init (EvolutionSession *session) EvolutionSession * evolution_session_new (void) { - return gtk_type_new (evolution_session_get_type ()); + return g_object_new (evolution_session_get_type (), NULL); } diff --git a/shell/evolution-session.h b/shell/evolution-session.h index 1310ad9256..34525a9ed1 100644 --- a/shell/evolution-session.h +++ b/shell/evolution-session.h @@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* evolution-session.h * - * Copyright (C) 2000 Ximian, Inc. + * Copyright (C) 2000, 2001, 2002 Ximian, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/shell/evolution-shell-component-dnd.c b/shell/evolution-shell-component-dnd.c index 7648d98677..c3be3db88b 100644 --- a/shell/evolution-shell-component-dnd.c +++ b/shell/evolution-shell-component-dnd.c @@ -41,9 +41,9 @@ struct _DndSourceFolderPrivate { gpointer user_data; }; -/* GtkObject methods */ +/* GObject methods */ static void -dnd_source_destroy (GtkObject *object) +dnd_source_finalize (GObject *object) { EvolutionShellComponentDndSourceFolder *folder; DndSourceFolderPrivate *priv; @@ -55,7 +55,7 @@ dnd_source_destroy (GtkObject *object) g_free (priv); - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } static void @@ -126,10 +126,10 @@ impl_GNOME_Evolution_ShellComponentDnd_SourceFolder_endDrag (PortableServer_Serv static void evolution_shell_component_dnd_source_folder_class_init (EvolutionShellComponentDndSourceFolderClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = dnd_source_destroy; + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = dnd_source_finalize; klass->epv.beginDrag = impl_GNOME_Evolution_ShellComponentDnd_SourceFolder_beginDrag; klass->epv.getData = impl_GNOME_Evolution_ShellComponentDnd_SourceFolder_getData; @@ -172,7 +172,7 @@ evolution_shell_component_dnd_source_folder_new (DndSourceFolderBeginDragFn begi g_return_val_if_fail (delete_data != NULL, NULL); g_return_val_if_fail (end_drag != NULL, NULL); - dnd_source = gtk_type_new (evolution_shell_component_dnd_source_folder_get_type ()); + dnd_source = g_object_new (evolution_shell_component_dnd_source_folder_get_type (), NULL); dnd_source->priv->begin_drag = begin_drag; dnd_source->priv->get_data = get_data; @@ -195,7 +195,7 @@ struct _DndDestinationFolderPrivate { /* GtkObject methods */ static void -dnd_destination_destroy (GtkObject *object) +dnd_destination_finalize (GObject *object) { EvolutionShellComponentDndDestinationFolder *folder; DndDestinationFolderPrivate *priv; @@ -207,7 +207,7 @@ dnd_destination_destroy (GtkObject *object) g_free (priv); - GTK_OBJECT_CLASS (parent_class)->destroy (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } /* CORBA interface */ @@ -251,10 +251,10 @@ impl_GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleDrop (PortableSer static void evolution_shell_component_dnd_destination_folder_class_init (EvolutionShellComponentDndDestinationFolderClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = dnd_destination_destroy; + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = dnd_destination_finalize; klass->epv.handleMotion = impl_GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleMotion; klass->epv.handleDrop = impl_GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleDrop; @@ -292,7 +292,7 @@ evolution_shell_component_dnd_destination_folder_new (DndDestinationFolderHandle g_return_val_if_fail (handle_motion != NULL, NULL); g_return_val_if_fail (handle_drop != NULL, NULL); - dnd_destination = gtk_type_new (evolution_shell_component_dnd_destination_folder_get_type ()); + dnd_destination = g_object_new (evolution_shell_component_dnd_destination_folder_get_type (), NULL); dnd_destination->priv->handle_motion = handle_motion; dnd_destination->priv->handle_drop = handle_drop; diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c index 6c286d19c1..883818640c 100644 --- a/shell/evolution-shell-component.c +++ b/shell/evolution-shell-component.c @@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* evolution-shell-component.c * - * Copyright (C) 2000, 2001 Ximian, Inc. + * Copyright (C) 2000, 2001, 2002 Ximian, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -239,7 +239,7 @@ owner_ping_callback (void *data) if (priv->owner_client != NULL) { g_print ("\t*** The shell has disappeared\n"); - gtk_signal_emit (GTK_OBJECT (shell_component), signals[OWNER_DIED]); + g_signal_emit (shell_component, signals[OWNER_DIED], 0); } priv->ping_timeout_id = -1; @@ -420,7 +420,7 @@ impl_setOwner (PortableServer_Servant servant, CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_ShellComponent_OldOwnerHasDied, NULL); - gtk_signal_emit (GTK_OBJECT (shell_component), signals[OWNER_DIED]); + g_signal_emit (shell_component, signals[OWNER_DIED], 0); } return; @@ -430,7 +430,7 @@ impl_setOwner (PortableServer_Servant servant, if (ev->_major == CORBA_NO_EXCEPTION) { priv->owner_client = evolution_shell_client_new (shell_duplicate); - gtk_signal_emit (GTK_OBJECT (shell_component), signals[OWNER_SET], priv->owner_client, evolution_homedir); + g_signal_emit (shell_component, signals[OWNER_SET], 0, priv->owner_client, evolution_homedir); setup_owner_pinging (shell_component); } @@ -454,7 +454,7 @@ impl_unsetOwner (PortableServer_Servant servant, return; } - gtk_signal_emit (GTK_OBJECT (shell_component), signals[OWNER_UNSET]); + g_signal_emit (shell_component, signals[OWNER_UNSET], 0); } static void @@ -477,7 +477,7 @@ impl_debug (PortableServer_Servant servant, dup2 (fd, STDERR_FILENO); close (fd); - gtk_signal_emit (GTK_OBJECT (shell_component), signals[DEBUG]); + g_signal_emit (shell_component, signals[DEBUG], 0); } static void @@ -491,7 +491,7 @@ impl_interactive (PortableServer_Servant servant, bonobo_object = bonobo_object_from_servant (servant); shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object); - gtk_signal_emit (GTK_OBJECT (shell_component), signals[INTERACTIVE], interactive); + g_signal_emit (shell_component, signals[INTERACTIVE], 0, interactive); } static Bonobo_Control @@ -547,7 +547,7 @@ impl_handleExternalURI (PortableServer_Servant servant, shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object_from_servant (servant)); - gtk_signal_emit (GTK_OBJECT (shell_component), signals[HANDLE_EXTERNAL_URI], uri); + g_signal_emit (shell_component, signals[HANDLE_EXTERNAL_URI], 0, uri); } static void @@ -711,7 +711,7 @@ impl_userCreateNewItem (PortableServer_Servant servant, /* FIXME: Check that the type is good. */ - gtk_signal_emit (GTK_OBJECT (shell_component), signals[USER_CREATE_NEW_ITEM], id, parent_physical_uri, parent_type); + g_signal_emit (shell_component, signals[USER_CREATE_NEW_ITEM], 0, id, parent_physical_uri, parent_type); } static void @@ -722,7 +722,7 @@ impl_sendReceive (PortableServer_Servant servant, EvolutionShellComponent *shell_component; shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object_from_servant (servant)); - gtk_signal_emit (GTK_OBJECT (shell_component), signals[SEND_RECEIVE], show_dialog); + g_signal_emit (shell_component, signals[SEND_RECEIVE], 0, show_dialog); } static void @@ -752,10 +752,10 @@ impl_requestQuit (PortableServer_Servant servant, } -/* GtkObject methods. */ +/* GObject methods. */ static void -destroy (GtkObject *object) +impl_finalize (GObject *object) { EvolutionShellComponent *shell_component; EvolutionShellComponentPrivate *priv; @@ -809,7 +809,7 @@ destroy (GtkObject *object) g_free (priv); - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -850,7 +850,7 @@ impl_owner_died (EvolutionShellComponent *shell_component) even if they don't handle the new ::owner_died signal correctly yet. */ - gtk_signal_emit (GTK_OBJECT (shell_component), signals[OWNER_UNSET]); + g_signal_emit (shell_component, signals[OWNER_UNSET], 0); } @@ -860,11 +860,11 @@ static void class_init (EvolutionShellComponentClass *klass) { EvolutionShellComponentClass *shell_component_class; - GtkObjectClass *object_class; + GObjectClass *object_class; POA_GNOME_Evolution_ShellComponent__epv *epv = &klass->epv; - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = destroy; + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = impl_finalize; signals[OWNER_SET] = gtk_signal_new ("owner_set", @@ -1075,7 +1075,7 @@ evolution_shell_component_new (const EvolutionShellComponentFolderType folder_ty g_return_val_if_fail (folder_types != NULL, NULL); - new = gtk_type_new (evolution_shell_component_get_type ()); + new = g_object_new (evolution_shell_component_get_type (), NULL); evolution_shell_component_construct (new, folder_types, diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c index fc700876e4..340a9b04d3 100644 --- a/shell/evolution-shell-view.c +++ b/shell/evolution-shell-view.c @@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* evolution-shell-view.c * - * Copyright (C) 2000 Ximian, Inc. + * Copyright (C) 2000, 2001, 2002 Ximian, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -61,7 +61,7 @@ impl_ShellView_set_message (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_MESSAGE], message, busy); + g_signal_emit (bonobo_object, signals[SET_MESSAGE], 0, message, busy); } static void @@ -71,7 +71,7 @@ impl_ShellView_unset_message (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[UNSET_MESSAGE]); + g_signal_emit (bonobo_object, signals[UNSET_MESSAGE], 0); } static void @@ -82,8 +82,7 @@ impl_ShellView_change_current_view (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[CHANGE_VIEW], - uri); + g_signal_emit (GTK_OBJECT (bonobo_object), signals[CHANGE_VIEW], 0, uri); } static void @@ -94,8 +93,7 @@ impl_ShellView_set_title (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_TITLE], - title); + g_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_TITLE], 0, title); } static void @@ -106,8 +104,7 @@ impl_ShellView_set_folder_bar_label (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_FOLDER_BAR_LABEL], - text); + g_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_FOLDER_BAR_LABEL], 0, text); } static void @@ -117,13 +114,13 @@ impl_ShellView_show_settings (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[SHOW_SETTINGS]); + g_signal_emit (GTK_OBJECT (bonobo_object), signals[SHOW_SETTINGS], 0); } -/* GtkObject methods. */ +/* GObject methods. */ static void -destroy (GtkObject *object) +impl_finalize (GObject *object) { EvolutionShellView *shell_view; EvolutionShellViewPrivate *priv; @@ -133,7 +130,7 @@ destroy (GtkObject *object) g_free (priv); - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -141,10 +138,10 @@ static void class_init (EvolutionShellViewClass *klass) { POA_GNOME_Evolution_ShellView__epv *epv; - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = destroy; + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = impl_finalize; epv = &klass->epv; epv->setMessage = impl_ShellView_set_message; 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 * diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index 3f01e23c7c..19cb957061 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -370,8 +370,8 @@ impl_Storage_asyncCreateFolder (PortableServer_Servant servant, storage = EVOLUTION_STORAGE (bonobo_object); obj_dup = CORBA_Object_duplicate (listener, ev); - gtk_signal_emit (GTK_OBJECT (storage), signals[CREATE_FOLDER], - obj_dup, path, type, description, parent_physical_uri); + g_signal_emit (storage, signals[CREATE_FOLDER], 0, + obj_dup, path, type, description, parent_physical_uri); } @@ -390,8 +390,8 @@ impl_Storage_asyncRemoveFolder (PortableServer_Servant servant, storage = EVOLUTION_STORAGE (bonobo_object); obj_dup = CORBA_Object_duplicate (listener, ev); - gtk_signal_emit (GTK_OBJECT (storage), signals[REMOVE_FOLDER], - obj_dup, path, physical_uri); + g_signal_emit (GTK_OBJECT (storage), signals[REMOVE_FOLDER], 0, + obj_dup, path, physical_uri); } static void @@ -410,8 +410,8 @@ impl_Storage_asyncXferFolder (PortableServer_Servant servant, storage = EVOLUTION_STORAGE (bonobo_object); obj_dup = CORBA_Object_duplicate (listener, ev); - gtk_signal_emit (GTK_OBJECT (storage), signals[XFER_FOLDER], - obj_dup, source_path, destination_path, remove_source); + g_signal_emit (GTK_OBJECT (storage), signals[XFER_FOLDER], 0, + obj_dup, source_path, destination_path, remove_source); } static void @@ -428,8 +428,8 @@ impl_Storage_updateFolder (PortableServer_Servant servant, bonobo_object = bonobo_object_from_servant (servant); storage = EVOLUTION_STORAGE (bonobo_object); - gtk_signal_emit (GTK_OBJECT (storage), signals[UPDATE_FOLDER], - path, unread_count); + g_signal_emit (GTK_OBJECT (storage), signals[UPDATE_FOLDER], 0, + path, unread_count); priv = storage->priv; @@ -461,7 +461,8 @@ impl_Storage_asyncOpenFolder (PortableServer_Servant servant, bonobo_object = bonobo_object_from_servant (servant); storage = EVOLUTION_STORAGE (bonobo_object); - gtk_signal_emit (GTK_OBJECT (storage), signals[OPEN_FOLDER], path); + g_signal_emit (GTK_OBJECT (storage), signals[OPEN_FOLDER], 0, + path); } static void @@ -479,8 +480,8 @@ impl_Storage_asyncDiscoverSharedFolder (PortableServer_Servant servant, storage = EVOLUTION_STORAGE (bonobo_object); obj_dup = CORBA_Object_duplicate (listener, ev); - gtk_signal_emit (GTK_OBJECT (storage), signals[DISCOVER_SHARED_FOLDER], - obj_dup, user, folder_name); + g_signal_emit (GTK_OBJECT (storage), signals[DISCOVER_SHARED_FOLDER], 0, + obj_dup, user, folder_name); } static void @@ -495,8 +496,8 @@ impl_Storage_cancelDiscoverSharedFolder (PortableServer_Servant servant, bonobo_object = bonobo_object_from_servant (servant); storage = EVOLUTION_STORAGE (bonobo_object); - gtk_signal_emit (GTK_OBJECT (storage), signals[CANCEL_DISCOVER_SHARED_FOLDER], - user, folder_name); + g_signal_emit (GTK_OBJECT (storage), signals[CANCEL_DISCOVER_SHARED_FOLDER], 0, + user, folder_name); } static void @@ -513,8 +514,8 @@ impl_Storage_asyncRemoveSharedFolder (PortableServer_Servant servant, storage = EVOLUTION_STORAGE (bonobo_object); obj_dup = CORBA_Object_duplicate (listener, ev); - gtk_signal_emit (GTK_OBJECT (storage), signals[REMOVE_SHARED_FOLDER], - obj_dup, path); + g_signal_emit (GTK_OBJECT (storage), signals[REMOVE_SHARED_FOLDER], 0, + obj_dup, path); } static void @@ -557,8 +558,8 @@ impl_Storage_showFolderProperties (PortableServer_Servant servant, EvolutionStorage *storage; storage = EVOLUTION_STORAGE (bonobo_object_from_servant (servant)); - gtk_signal_emit (GTK_OBJECT (storage), signals[SHOW_FOLDER_PROPERTIES], - path, item_number, parent_window_id); + g_signal_emit (GTK_OBJECT (storage), signals[SHOW_FOLDER_PROPERTIES], 0, + path, item_number, parent_window_id); } static GNOME_Evolution_Storage_FolderPropertyItemList * @@ -597,7 +598,7 @@ impl_Storage__get_folderPropertyItems (PortableServer_Servant servant, } -/* GtkObject methods. */ +/* GObject methods. */ static void free_mapping (gpointer key, gpointer value, gpointer user_data) @@ -607,7 +608,7 @@ free_mapping (gpointer key, gpointer value, gpointer user_data) } static void -destroy (GtkObject *object) +impl_finalize (GObject *object) { EvolutionStorage *storage; EvolutionStoragePrivate *priv; @@ -658,7 +659,7 @@ destroy (GtkObject *object) g_free (priv); - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -666,10 +667,10 @@ static void class_init (EvolutionStorageClass *klass) { POA_GNOME_Evolution_Storage__epv *epv; - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = destroy; + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = impl_finalize; epv = & klass->epv; epv->_get_name = impl_Storage__get_name; @@ -831,7 +832,7 @@ evolution_storage_new (const char *name, g_return_val_if_fail (name != NULL, NULL); g_return_val_if_fail (name[0] != '\0', NULL); - new = gtk_type_new (evolution_storage_get_type ()); + new = g_object_new (evolution_storage_get_type (), 0); evolution_storage_construct (new, name, has_shared_folders); @@ -1112,8 +1113,8 @@ evolution_storage_update_folder (EvolutionStorage *evolution_storage, priv = evolution_storage->priv; - gtk_signal_emit (GTK_OBJECT (evolution_storage), signals[UPDATE_FOLDER], - path, unread_count); + g_signal_emit (GTK_OBJECT (evolution_storage), signals[UPDATE_FOLDER], 0, + path, unread_count); if (priv->corba_storage_listeners == NULL) return EVOLUTION_STORAGE_ERROR_NOTREGISTERED; diff --git a/shell/evolution-test-component.c b/shell/evolution-test-component.c index 2ddda0a7ce..affaa50aff 100644 --- a/shell/evolution-test-component.c +++ b/shell/evolution-test-component.c @@ -244,13 +244,13 @@ create_new_folder_selector (EvolutionShellComponent *shell_component) if (BONOBO_EX (&ev)) g_warning ("Cannot show checkboxes -- %s", BONOBO_EX_ID (&ev)); - gtk_signal_connect (GTK_OBJECT (dialog), "clicked", - GTK_SIGNAL_FUNC (dialog_clicked_callback), storage_set_view_iface); + g_signal_connect (dialog, "clicked", + G_CALLBACK (dialog_clicked_callback), storage_set_view_iface); /* This is necessary to unref the StorageSetView iface once we are done with it. */ - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (dialog_destroy_callback), storage_set_view_iface); + g_signal_connect (dialog, "destroy", + G_CALLBACK (dialog_destroy_callback), storage_set_view_iface); gtk_widget_show (control_widget); gtk_widget_show (dialog); @@ -366,10 +366,10 @@ setup_custom_storage (EvolutionShellClient *shell_client) the_storage = evolution_storage_new ("TestStorage", TRUE); - gtk_signal_connect (GTK_OBJECT (the_storage), "discover_shared_folder", - GTK_SIGNAL_FUNC (storage_discover_shared_folder_callback), shell_client); - gtk_signal_connect (GTK_OBJECT (the_storage), "cancel_discover_shared_folder", - GTK_SIGNAL_FUNC (storage_cancel_discover_shared_folder_callback), shell_client); + g_signal_connect (the_storage, "discover_shared_folder", + G_CALLBACK (storage_discover_shared_folder_callback), shell_client); + g_signal_connect (the_storage, "cancel_discover_shared_folder", + G_CALLBACK (storage_cancel_discover_shared_folder_callback), shell_client); /* Add some custom "Properties" items. */ evolution_storage_add_property_item (the_storage, "Sharing...", @@ -377,8 +377,8 @@ setup_custom_storage (EvolutionShellClient *shell_client) evolution_storage_add_property_item (the_storage, "Permissions...", "Change permissions for this folder", NULL); - gtk_signal_connect (GTK_OBJECT (the_storage), "show_folder_properties", - GTK_SIGNAL_FUNC (storage_show_folder_properties_callback), NULL); + g_signal_connect (the_storage, "show_folder_properties", + G_CALLBACK (storage_show_folder_properties_callback), NULL); result = evolution_storage_register_on_shell (the_storage, BONOBO_OBJREF (shell_client)); if (result != EVOLUTION_STORAGE_OK) { @@ -424,7 +424,7 @@ timeout_callback_3 (void *data) activity_client = EVOLUTION_ACTIVITY_CLIENT (data); - gtk_object_unref (GTK_OBJECT (activity_client)); + g_object_unref (activity_client); g_print ("--> Done.\n"); @@ -491,10 +491,10 @@ timeout_callback_1 (void *data) gtk_object_set_data (GTK_OBJECT (activity_client), "my_progress", GINT_TO_POINTER (-1)); - gtk_signal_connect (GTK_OBJECT (activity_client), "cancel", - GTK_SIGNAL_FUNC (activity_client_cancel_callback), NULL); - gtk_signal_connect (GTK_OBJECT (activity_client), "show_details", - GTK_SIGNAL_FUNC (activity_client_show_details_callback), NULL); + g_signal_connect (activity_client, "cancel", + G_CALLBACK (activity_client_cancel_callback), NULL); + g_signal_connect (activity_client, "show_details", + G_CALLBACK (activity_client_show_details_callback), NULL); g_print ("Component becoming busy -- %s\n", COMPONENT_ID); if (suggest_display) @@ -641,10 +641,10 @@ register_component (void) request_quit_fn, NULL); - gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set", - GTK_SIGNAL_FUNC (owner_set_callback), NULL); - gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset", - GTK_SIGNAL_FUNC (owner_unset_callback), NULL); + g_signal_connect (shell_component, "owner_set", + G_CALLBACK (owner_set_callback), NULL); + g_signal_connect (shell_component, "owner_unset", + G_CALLBACK (owner_unset_callback), NULL); evolution_shell_component_add_user_creatable_item (shell_component, "Stuff", "New Stuff", "New _Stuff", @@ -662,8 +662,8 @@ register_component (void) NULL, 's', NULL); - gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item", - GTK_SIGNAL_FUNC (user_create_new_item_callback), NULL); + g_signal_connect (shell_component, "user_create_new_item", + G_CALLBACK (user_create_new_item_callback), NULL); result = oaf_active_server_register (COMPONENT_ID, bonobo_object_corba_objref (BONOBO_OBJECT (shell_component))); diff --git a/shell/evolution-wizard.c b/shell/evolution-wizard.c index 9b036e517a..3a6dd2242b 100644 --- a/shell/evolution-wizard.c +++ b/shell/evolution-wizard.c @@ -1,7 +1,22 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* * evolution-wizard.c * - * Copyright (C) 2001 Ximian, Inc. + * Copyright (C) 2000, 2001, 2002 Ximian, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. * * Authors: Iain Holmes <iain@ximian.com> */ @@ -110,33 +125,27 @@ impl_GNOME_Evolution_Wizard_notifyAction (PortableServer_Servant servant, switch (action) { case GNOME_Evolution_Wizard_NEXT: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[NEXT], - pagenumber); + g_signal_emit (bonobo_object, signals[NEXT], 0, pagenumber); break; case GNOME_Evolution_Wizard_PREPARE: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[PREPARE], - pagenumber); + g_signal_emit (bonobo_object, signals[PREPARE], 0, pagenumber); break; case GNOME_Evolution_Wizard_BACK: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[BACK], - pagenumber); + g_signal_emit (bonobo_object, signals[BACK], 0, pagenumber); break; case GNOME_Evolution_Wizard_FINISH: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[FINISH], - pagenumber); + g_signal_emit (bonobo_object, signals[FINISH], 0, pagenumber); break; case GNOME_Evolution_Wizard_CANCEL: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[CANCEL], - pagenumber); + g_signal_emit (bonobo_object, signals[CANCEL], 0, pagenumber); break; case GNOME_Evolution_Wizard_HELP: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[HELP], - pagenumber); + g_signal_emit (bonobo_object, signals[HELP], 0, pagenumber); break; default: @@ -146,29 +155,29 @@ impl_GNOME_Evolution_Wizard_notifyAction (PortableServer_Servant servant, static void -evolution_wizard_destroy (GtkObject *object) +impl_finalize (GObject *object) { EvolutionWizard *wizard; wizard = EVOLUTION_WIZARD (object); - if (wizard->priv == NULL) { + if (wizard->priv == NULL) return; - } g_free (wizard->priv); wizard->priv = NULL; - parent_class->destroy (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } + static void evolution_wizard_class_init (EvolutionWizardClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; POA_GNOME_Evolution_Wizard__epv *epv = &klass->epv; - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = evolution_wizard_destroy; + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = impl_finalize; signals[NEXT] = gtk_signal_new ("next", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), diff --git a/shell/main.c b/shell/main.c index 2108f183fd..612eae7401 100644 --- a/shell/main.c +++ b/shell/main.c @@ -92,7 +92,7 @@ quit_box_new (void) gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); /* (Just to prevent smart-ass window managers like Sawfish from setting - the make the dialog as big as the standard Evolution window). */ + the make the dialog as big as the standard Evolution window). */ gtk_window_set_wmclass (GTK_WINDOW (window), "evolution-quit", "Evolution:quit"); e_make_widget_backing_stored (window); @@ -144,7 +144,7 @@ no_views_left_cb (EShell *shell, gpointer data) GtkWidget *quit_box; quit_box = quit_box_new (); - gtk_signal_connect (GTK_OBJECT (quit_box), "destroy", GTK_SIGNAL_FUNC (quit_box_destroyed_callback), &quit_box); + g_signal_connect (quit_box, "destroy", G_CALLBACK (quit_box_destroyed_callback), &quit_box); /* FIXME: This is wrong. We should exit only when the shell is destroyed. But refcounting is broken at present, so this is a @@ -245,7 +245,7 @@ show_development_warning (GtkWindow *parent) "\n" "We hope that you enjoy the results of our hard work, and we\n" "eagerly await your contributions!\n" - )); + )); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), @@ -253,9 +253,9 @@ show_development_warning (GtkWindow *parent) label = gtk_label_new ( _( - "Thanks\n" - "The Ximian Evolution Team\n" - )); + "Thanks\n" + "The Ximian Evolution Team\n" + )); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT); gtk_misc_set_alignment(GTK_MISC(label), 1, .5); @@ -273,9 +273,9 @@ show_development_warning (GtkWindow *parent) gtk_widget_show_all (warning_dialog); - gtk_signal_connect (GTK_OBJECT (warning_dialog), "clicked", - GTK_SIGNAL_FUNC (warning_dialog_clicked_callback), - dont_bother_me_again_checkbox); + g_signal_connect (warning_dialog, "clicked", + G_CALLBACK (warning_dialog_clicked_callback), + dont_bother_me_again_checkbox); } /* The following signal handlers are used to display the development warning as @@ -286,7 +286,7 @@ view_map_callback (GtkWidget *widget, void *data) { gtk_signal_disconnect_by_func (GTK_OBJECT (widget), - GTK_SIGNAL_FUNC (view_map_callback), + G_CALLBACK (view_map_callback), data); show_development_warning (GTK_WINDOW (widget)); @@ -298,10 +298,10 @@ new_view_created_callback (EShell *shell, void *data) { gtk_signal_disconnect_by_func (GTK_OBJECT (shell), - GTK_SIGNAL_FUNC (new_view_created_callback), + G_CALLBACK (new_view_created_callback), data); - gtk_signal_connect (GTK_OBJECT (view), "map", GTK_SIGNAL_FUNC (view_map_callback), NULL); + g_signal_connect (view, "map", G_CALLBACK (view_map_callback), NULL); } @@ -368,14 +368,14 @@ idle_cb (void *data) case E_SHELL_CONSTRUCT_RESULT_OK: e_shell_config_factory_register (shell); - gtk_signal_connect (GTK_OBJECT (shell), "no_views_left", - GTK_SIGNAL_FUNC (no_views_left_cb), NULL); - gtk_signal_connect (GTK_OBJECT (shell), "destroy", - GTK_SIGNAL_FUNC (destroy_cb), NULL); + g_signal_connect (shell, "no_views_left", + G_CALLBACK (no_views_left_cb), NULL); + g_signal_connect (shell, "destroy", + G_CALLBACK (destroy_cb), NULL); if (!getenv ("EVOLVE_ME_HARDER")) - gtk_signal_connect (GTK_OBJECT (shell), "new_view_created", - GTK_SIGNAL_FUNC (new_view_created_callback), NULL); + g_signal_connect (shell, "new_view_created", + G_CALLBACK (new_view_created_callback), NULL); corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell)); corba_shell = CORBA_Object_duplicate (corba_shell, &ev); |