No need to check for priv being NULL here anymore.

* e-activity-handler.c (impl_operationStarted): No need to check
for priv being NULL here anymore.
(impl_operationProgressing): Likewise.
(impl_operationFinished): Likewise.
(impl_requestDialog): Likewise.

* evolution-folder-selector-button.c (clicked): Use
g_object_add_weak_pointer() on the parent_window instead of using
GTK_OBJECT_DESTROYED().

svn path=/trunk/; revision=18782

3 files changed, 17 insertions, 21 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 6baae59447..5b63e98882 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,17 @@
 2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
 
+	* e-activity-handler.c (impl_operationStarted): No need to check
+	for priv being NULL here anymore.
+	(impl_operationProgressing): Likewise.
+	(impl_operationFinished): Likewise.
+	(impl_requestDialog): Likewise.
+
+	* evolution-folder-selector-button.c (clicked): Use
+	g_object_add_weak_pointer() on the parent_window instead of using
+	GTK_OBJECT_DESTROYED().
+
+2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
+
 	* e-shell-startup-wizard.c (e_shell_startup_wizard_create): For
 	now, always return TRUE.
 
diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c
index b85f9cb06b..c61256505f 100644
--- a/shell/e-activity-handler.c
+++ b/shell/e-activity-handler.c
@@ -388,10 +388,6 @@ impl_operationStarted (PortableServer_Servant servant,
 
 	activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant));
 
-	/* FIXME */
-	if (/* GTK_OBJECT_DESTROYED (activity_handler) || */ activity_handler->priv == NULL)
-		return;
-
 	priv = activity_handler->priv;
 
 	if (icon->_length == 0) {
@@ -439,10 +435,6 @@ impl_operationProgressing (PortableServer_Servant servant,
 
 	activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant));
 
-	/* FIXME */
-	if (/* GTK_OBJECT_DESTROYED (activity_handler) || */ activity_handler->priv == NULL)
-		return;
-
 	priv = activity_handler->priv;
 
 	p = lookup_activity (priv->activity_infos, activity_id, &order_number);
@@ -483,10 +475,6 @@ impl_operationFinished (PortableServer_Servant servant,
 
 	activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant));
 
-	/* FIXME */
-	if (/* GTK_OBJECT_DESTROYED (activity_handler) || */ activity_handler->priv == NULL)
-		return;
-
 	priv = activity_handler->priv;
 
 	p = lookup_activity (priv->activity_infos, activity_id, &order_number);
@@ -512,10 +500,6 @@ impl_requestDialog (PortableServer_Servant servant,
 
 	activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant));
 
-	/* FIXME */
-	if (/* GTK_OBJECT_DESTROYED (activity_handler) || */ activity_handler->priv == NULL)
-		return GNOME_Evolution_Activity_DIALOG_ACTION_ERROR;
-
 	/* FIXME implement.  */
 	g_warning ("Evolution::Activity::requestDialog not implemented");
 
diff --git a/shell/evolution-folder-selector-button.c b/shell/evolution-folder-selector-button.c
index 144e47afc2..39d05354e9 100644
--- a/shell/evolution-folder-selector-button.c
+++ b/shell/evolution-folder-selector-button.c
@@ -161,6 +161,8 @@ clicked (GtkButton *button)
 
 	g_signal_emit (folder_selector_button, signals[POPPED_UP], 0);
 
+	g_object_add_weak_pointer (G_OBJECT (parent_window), (void **) &parent_window);
+
 	evolution_shell_client_user_select_folder (priv->shell_client,
 						   parent_window,
 						   priv->title,
@@ -168,17 +170,15 @@ clicked (GtkButton *button)
 						   (const char **)priv->possible_types,
 						   &return_folder);
 
-#if 0				/* FIXME */
+	g_object_remove_weak_pointer (G_OBJECT (parent_window), (void **) &parent_window);
+
 	/* If the parent gets destroyed despite our best efforts (eg,
 	 * because its own parent got destroyed), then the folder
 	 * selector button will have been destroyed too and we need
 	 * to just bail out here.
 	 */
-	if (GTK_OBJECT_DESTROYED (parent_window)) {
-		g_object_unref (parent_window);
+	if (parent_window == NULL)
 		return;
-	}
-#endif
 
 	gtk_widget_set_sensitive (GTK_WIDGET (parent_window), TRUE);
 	g_object_unref (parent_window);