diff options
-rw-r--r-- | mail/ChangeLog | 6 | ||||
-rw-r--r-- | mail/component-factory.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index dea8c9be1e..37c2b689de 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2000-07-03 Ettore Perazzoli <ettore@helixcode.com> + + * component-factory.c (create_folder): Get rid of a compiler + warning by making sure `folder' is always initialized to some + value for any code path. + 2000-07-03 Dan Winship <danw@helixcode.com> * message-list.c (select_msg): call mail_display_set_message with diff --git a/mail/component-factory.c b/mail/component-factory.c index 2b2f33eda5..1237b1f638 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -126,12 +126,16 @@ create_folder (EvolutionShellComponent *shell_component, folder = camel_store_get_folder (store, "mbox", TRUE, &ex); gtk_object_unref (GTK_OBJECT (store)); + } else { + folder = NULL; } + if (!camel_exception_is_set (&ex)) { gtk_object_unref (GTK_OBJECT (folder)); result = Evolution_ShellComponentListener_OK; - } else + } else { result = Evolution_ShellComponentListener_INVALID_URI; + } } camel_exception_clear (&ex); |