From dbcaac3afaabb7345f0c76a04a76f78b310f79af Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 11 Oct 2001 16:47:17 +0000 Subject: Make sure the service/storage are non-NULL. 2001-10-11 Jeffrey Stedfast * component-factory.c (free_storage): Make sure the service/storage are non-NULL. * mail-callbacks.c (e_gnome_dialog_parent_destroyed): Call gtk_main_quit. (send_receive_mail): Don't use e_gnome stuff since this doesn't need to be run using gnome_dialog_run_and_close(). (composer_send_cb): Same. (edit_msg): Here too. (resend_msg): And here. (search_msg): Same. (filter_edit): Here too. (filter_edit): Don't use e_gnome_dialog_set_parent() because we don't do gnome_dialog_run_and_close on this dialog. (e_gnome_error_dialog_parented): Removed. (e_gnome_ok_dialog_parented): Removed. svn path=/trunk/; revision=13583 --- mail/component-factory.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'mail/component-factory.c') diff --git a/mail/component-factory.c b/mail/component-factory.c index e193fec3c6..5d47f42d31 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -729,9 +729,13 @@ owner_set_cb (EvolutionShellComponent *shell_component, static void free_storage (gpointer service, gpointer storage, gpointer data) { - camel_service_disconnect (CAMEL_SERVICE (service), TRUE, NULL); - camel_object_unref (CAMEL_OBJECT (service)); - bonobo_object_unref (BONOBO_OBJECT (storage)); + if (service) { + camel_service_disconnect (CAMEL_SERVICE (service), TRUE, NULL); + camel_object_unref (CAMEL_OBJECT (service)); + } + + if (storage) + bonobo_object_unref (BONOBO_OBJECT (storage)); } static void -- cgit