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, 9 insertions, 16 deletions

diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c
index c7664d866b..09bd3d725d 100644
--- a/shell/e-shell-folder-creation-dialog.c
+++ b/shell/e-shell-folder-creation-dialog.c
@@ -211,8 +211,8 @@ dialog_response_cb (GnomeDialog *dialog,
 }
 
 static void
-dialog_destroy_cb (GtkObject *object,
-		   void *data)
+dialog_destroy_notify (void *data,
+		       GObject *where_the_dialog_was)
 {
 	DialogData *dialog_data;
 
@@ -266,17 +266,15 @@ storage_set_view_folder_selected_cb (EStorageSetView *storage_set_view,
 
 /* Shell signal callbacks.  */
 
-#if 0
 static void
-shell_destroy_cb (GtkObject *object,
-		  void *data)
+shell_destroy_notify (void *data,
+		      GObject *where_the_shell_was)
 {
-	GnomeDialog *dialog;
+	DialogData *dialog_data = (DialogData *) data;
 
-	dialog = GNOME_DIALOG (data);
-	gtk_widget_destroy (GTK_WIDGET (dialog));
+	dialog_data->shell = NULL;
+	gtk_widget_destroy (GTK_WIDGET (dialog_data->dialog));
 }
-#endif
 
 
 /* Dialog setup.  */
@@ -528,8 +526,7 @@ e_shell_show_folder_creation_dialog (EShell *shell,
 
 	g_signal_connect (dialog, "response",
 			  G_CALLBACK (dialog_response_cb), dialog_data);
-	g_signal_connect (dialog, "destroy",
-			  G_CALLBACK (dialog_destroy_cb), dialog_data);
+	g_object_weak_ref (G_OBJECT (dialog), dialog_destroy_notify, dialog_data);
 
 	g_signal_connect (dialog_data->folder_name_entry, "changed",
 			  G_CALLBACK (folder_name_entry_changed_cb), dialog_data);
@@ -537,11 +534,7 @@ e_shell_show_folder_creation_dialog (EShell *shell,
 	g_signal_connect (dialog_data->storage_set_view, "folder_selected",
 			  G_CALLBACK (storage_set_view_folder_selected_cb), dialog_data);
 
-#if 0				/* FIXME */
-	g_signal_connect_object (GTK_OBJECT (shell), "destroy",
-				 G_CALLBACK (shell_destroy_cb), dialog_data,
-				 GTK_OBJECT (dialog));
-#endif
+	g_object_weak_ref (G_OBJECT (shell), shell_destroy_notify, dialog_data);
 
 	g_object_unref (gui);
 }