diff options
| -rw-r--r-- | shell/ChangeLog | 8 | ||||
| -rw-r--r-- | shell/e-activity-handler.c | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index be2843caf7..4a5d2bcc26 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,13 @@ 2001-10-25 Ettore Perazzoli <ettore@ximian.com> + * e-activity-handler.c (impl_destroy): Set ->priv to NULL. + (impl_operationStarted): Check for priv not being NULL. + (impl_operationProgressing): Likewise. + (impl_operationFinished): Likewise. + (impl_requestDialog): Likewise. + +2001-10-25 Ettore Perazzoli <ettore@ximian.com> + * e-shell-startup-wizard.c (make_mail_dialog_pages): Set the ->mailer to be CORBA_OBJECT_NIL in case of an exception, otherwise the caller will not realize about the problem. diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c index 611d318378..960a02d19e 100644 --- a/shell/e-activity-handler.c +++ b/shell/e-activity-handler.c @@ -380,6 +380,7 @@ impl_destroy (GtkObject *object) } g_free (priv); + handler->priv = NULL; (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } @@ -407,7 +408,7 @@ impl_operationStarted (PortableServer_Servant servant, activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant)); - if (GTK_OBJECT_DESTROYED (activity_handler)) + if (GTK_OBJECT_DESTROYED (activity_handler) || activity_handler->priv == NULL) return; priv = activity_handler->priv; @@ -457,7 +458,7 @@ impl_operationProgressing (PortableServer_Servant servant, activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant)); - if (GTK_OBJECT_DESTROYED (activity_handler)) + if (GTK_OBJECT_DESTROYED (activity_handler) || activity_handler->priv == NULL) return; priv = activity_handler->priv; @@ -500,7 +501,7 @@ impl_operationFinished (PortableServer_Servant servant, activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant)); - if (GTK_OBJECT_DESTROYED (activity_handler)) + if (GTK_OBJECT_DESTROYED (activity_handler) || activity_handler->priv == NULL) return; priv = activity_handler->priv; @@ -528,7 +529,7 @@ impl_requestDialog (PortableServer_Servant servant, activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant)); - if (GTK_OBJECT_DESTROYED (activity_handler)) + if (GTK_OBJECT_DESTROYED (activity_handler) || activity_handler->priv == NULL) return GNOME_Evolution_Activity_DIALOG_ACTION_ERROR; /* FIXME implement. */ |