aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/component-factory.c2
-rw-r--r--mail/folder-browser.c5
3 files changed, 9 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3932c164e5..a53c262a8c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-20 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * component-factory.c (create_imap_storage): Oops. Should
+ have checked for a NULL sources.
+
2000-06-20 Dan Winship <danw@helixcode.com>
* message-list.c (mark_msg_seen): Quick hack to prevent a NULL
diff --git a/mail/component-factory.c b/mail/component-factory.c
index b1bdc09d18..bea11d4029 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -264,7 +264,7 @@ create_imap_storage (EvolutionShellComponent *shell_component)
source = gnome_config_get_string (cpath);
g_free (cpath);
- if (strncasecmp (source, "imap://", 7))
+ if (!source || strncasecmp (source, "imap://", 7))
return;
corba_shell = evolution_shell_component_get_owner (shell_component);
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index b8b9287d08..6a90b23b30 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -104,12 +104,12 @@ folder_browser_load_folder (FolderBrowser *fb, const char *name)
/* uhm, I'm just guessing here - this code might be wrong */
char *service, *ptr;
- fprintf (stderr, "\n****** name = %s ******\n\n", name);
+ fprintf (stderr, "\n****** name = %s ******\n", name);
service = g_strdup_printf ("%s/", name);
for (ptr = service + 7; *ptr && *ptr != '/'; ptr++);
ptr++;
*ptr = '\0';
- fprintf (stderr, "\n****** service = %s ******\n\n", service);
+ fprintf (stderr, "****** service = %s ******\n", service);
store = camel_session_get_store (session, service, ex);
g_free (service);
if (store) {
@@ -118,6 +118,7 @@ folder_browser_load_folder (FolderBrowser *fb, const char *name)
for (ptr = name + 7; *ptr && *ptr != '/'; ptr++);
if (*ptr == '/') {
folder_name = ptr + 1;
+ fprintf (stderr, "getting folder: %s\n", folder_name);
new_folder = camel_store_get_folder (store, folder_name, TRUE, ex);
}
}