diff options
author | Jeffrey Stedfast <fejj@ximian.com> | 2001-10-12 00:47:17 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-10-12 00:47:17 +0800 |
commit | dbcaac3afaabb7345f0c76a04a76f78b310f79af (patch) | |
tree | c71b47d4a313cb5d64b4c8cb83164b6947b8cf50 /mail/component-factory.c | |
parent | a7b886424fdbc61d28b63b4cda24616988e23d5a (diff) | |
download | gsoc2013-evolution-dbcaac3afaabb7345f0c76a04a76f78b310f79af.tar.gz gsoc2013-evolution-dbcaac3afaabb7345f0c76a04a76f78b310f79af.tar.zst gsoc2013-evolution-dbcaac3afaabb7345f0c76a04a76f78b310f79af.zip |
Make sure the service/storage are non-NULL.
2001-10-11 Jeffrey Stedfast <fejj@ximian.com>
* 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
Diffstat (limited to 'mail/component-factory.c')
-rw-r--r-- | mail/component-factory.c | 10 |
1 files changed, 7 insertions, 3 deletions
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 |