Removed. (no_views_left_cb): Use g_object_add_weak_pointer() instad of

* main.c (quit_box_destroyed_callback): Removed.
(no_views_left_cb): Use g_object_add_weak_pointer() instad of
connecting to the "destroy" signal.
(destroy_cb): Removed.
(shell_weak_notify): New.
(idle_cb): Use g_object_weak_ref() on the shell object instead of
connecting to the "destroy" signal.

* evolution-test-component.c (dialog_destroy_callback): Removed.
(dialog_weak_notify): New.
(create_new_folder_selector): Use g_object_weak_ref() on the
dialog instead of connecting the "destroy" signal.

* e-shortcuts.c (view_destroyed_cb): Removed.
(view_weak_notify): New.
(e_shortcuts_new_view): g_object_weak_ref() the new view instead
of connecting the "destroy" signal.
(impl_dispose): Free the ->views and g_object_weak_unref() all the
items.

* e-shell.c (view_destroy_cb): Removed.
(view_weak_notify): New.
(create_view): Use g_object_weak_ref() on the newly created view
instead of connecting to the "destroy" signal.
(impl_dispose): g_object_weak_unref() the views.
(e_shell_show_settings): Use g_object_add_weak_pointer() on the
settings_dialog instead of connecting to the "destroy" signal.
(settings_dialog_destroy_cb): Removed.

* e-shell-shared-folder-picker-dialog.c
(progress_bar_weak_notify): New.
(progress_bar_destroy_callback): Removed.
(create_progress_dialog): Use g_object_weak_ref() on the progress
bar object instead of connecting to its "destroy" signal.
(shell_destroy_callback): Removed.
(shell_view_destroy_callback): Removed.
(storage_destroy_callback): Removed.
(shell_weak_notify): New.
(shell_view_weak_notify): New.
(storage_weak_notify): New.
(discover_folder): Use g_object_weak_ref() on the shell, parent,
storage objects instead of connecting to their "destroy" signals.

* e-shell-importer.c: Removed member destroyed from
ImporterComponentData.
(import_cb): Instead of checking if ->destroyed is TRUE, check if
->dialog is NULL to decide whether the dialog has been destroyed
or not.
(dialog_destroy_cb): Removed.
(start_import): Use g_object_weak_ref() on the dialog object
instead of connecting to its "destroy" signal.
(dialog_close): Removed.
(dialog_weak_notify): New.
(show_import_wizard): Use g_object_weak_ref() on the dialog object
instead of connecting to its "destroy" signal.
(import_druid_destroy): New.
(import_druid_weak_notify): New.
(show_import_wizard): Use g_object_weak_ref() on the druid object
instead of connecting to its "destroy" signal.

* e-shell-folder-selection-dialog.c
(e_shell_folder_selection_dialog_construct): g_object_weak_ref()
the shell object instead of connecting to its "destroy" signal.

* e-shell-folder-creation-dialog.c (dialog_destroy_cb): Removed.
(dialog_destroy_notify): New.
(e_shell_show_folder_creation_dialog): g_object_weak_ref() the
dialog instead of connecting to its "destroy" signal.
(shell_destroy_cb): Removed.
(shell_destroy_notify): New.
(e_shell_show_folder_creation_dialog): g_object_weak_ref() the
shell object instead of connecting to its "destroy" signal.

* e-shell-config-offline.c (config_control_destroy_callback):
Removed.
(config_control_destroy_notify): New.
(e_shell_config_offline_create_widget): g_object_weak_ref() the
config_control instead of connecting to its "destroy" signal.

* e-shell-config-default-folders.c
(config_control_destroy_callback): Removed.
(config_control_destroy_notify): New.
(e_shell_config_default_folders_create_widget):
g_object_weak_ref() instead of connecting to the "destroy" signal.

* e-shell-config-autocompletion.c (config_control_destroy_notify):
New.
(config_control_destroy_callback): Removed.
(e_shell_config_autocompletion_create_widget):
g_object_weak_ref() instead of connecting to the "destroy" signal.

* e-activity-handler.c (task_bar_destroy_cb): Removed.
(task_bar_destroy_notify): New.
(e_activity_handler_attach_task_bar): Weak_ref the task_bar using
task_bar_destroy_notify.
(impl_dispose): Weak_unref the task bars in priv->task_bars.

svn path=/trunk/; revision=18756

1 files changed, 13 insertions, 22 deletions

diff --git a/shell/e-shell-shared-folder-picker-dialog.c b/shell/e-shell-shared-folder-picker-dialog.c
index 16fee71c10..3c8065709c 100644
--- a/shell/e-shell-shared-folder-picker-dialog.c
+++ b/shell/e-shell-shared-folder-picker-dialog.c
@@ -296,8 +296,8 @@ progress_bar_timeout_callback (void *data)
 }
 
 static void
-progress_bar_destroy_callback (GtkObject *object,
-			       void *data)
+progress_bar_weak_notify (void *data,
+			  GObject *where_the_object_was)
 {
 	int timeout_id;
 
@@ -375,21 +375,17 @@ 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);
-	g_signal_connect (progress_bar, "destroy",
-			  G_CALLBACK (progress_bar_destroy_callback),
-			  GINT_TO_POINTER (timeout_id));
+	g_object_weak_ref (G_OBJECT (progress_bar), progress_bar_weak_notify, GINT_TO_POINTER (timeout_id));
 
 	timeout_id = g_timeout_add (PROGRESS_DIALOG_DELAY, progress_dialog_show_timeout_callback, dialog);
-	g_signal_connect (progress_bar, "destroy",
-			  G_CALLBACK (progress_bar_destroy_callback),
-			  GINT_TO_POINTER (timeout_id));
+	g_object_weak_ref (G_OBJECT (progress_bar), progress_bar_weak_notify, GINT_TO_POINTER (timeout_id));
 
 	return dialog;
 }
 
 static void
-shell_destroy_callback (GtkObject *object,
-			void *data)
+shell_weak_notify (void *data,
+		   GObject *where_the_object_was)
 {
 	DiscoveryData *discovery_data;
 
@@ -398,8 +394,8 @@ shell_destroy_callback (GtkObject *object,
 }
 
 static void
-shell_view_destroy_callback (GtkObject *object,
-			     void *data)
+shell_view_weak_notify (void *data,
+			GObject *where_the_object_was)
 {
 	DiscoveryData *discovery_data;
 
@@ -408,8 +404,8 @@ shell_view_destroy_callback (GtkObject *object,
 }
 
 static void
-storage_destroy_callback (GtkObject *object,
-			  void *data)
+storage_weak_notify (void *data,
+		     GObject *where_the_object_was)
 {
 	DiscoveryData *discovery_data;
 
@@ -487,14 +483,9 @@ discover_folder (EShell *shell,
 	discovery_data->storage            = storage;
 	g_object_ref (storage);
 
-	g_signal_connect (shell, "destroy",
-			  G_CALLBACK (shell_destroy_callback), discovery_data);
-
-	g_signal_connect (parent, "destroy",
-			  G_CALLBACK (shell_view_destroy_callback), discovery_data);
-
-	g_signal_connect (storage, "destroy",
-			  G_CALLBACK (storage_destroy_callback), discovery_data);
+	g_object_weak_ref (G_OBJECT (shell), shell_weak_notify, discovery_data);
+	g_object_weak_ref (G_OBJECT (parent), shell_view_weak_notify, discovery_data);
+	g_object_weak_ref (G_OBJECT (storage), storage_weak_notify, discovery_data);
 
 	g_signal_connect (dialog, "clicked",
 			  G_CALLBACK (progress_dialog_clicked_callback), discovery_data);