aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/mail-folder-cache.c11
-rw-r--r--mail/mail-ops.c10
3 files changed, 25 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9a8c8154d4..111fc40b64 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-05 Peter Williams <peterw@ximian.com>
+
+ * mail-folder-cache.c (mail_folder_cache_set_folder_browser): Clear the
+ shell view label if mailer loses focus.
+
+ * mail-ops.c (do_update_subfolders_rec): Check for NULL url before
+ calling folder cache functions.
+
2001-07-04 Gediminas Paulauskas <menesis@delfi.lt>
* folder-browser-ui.c (message_pixcache): set icon for ApplyFilters
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index d6fb475813..d3e64c73d3 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -805,6 +805,17 @@ mail_folder_cache_set_folder_browser (FolderBrowser *fb)
if (fb) {
dm ("Reffing new browser %p", fb);
gtk_object_ref (GTK_OBJECT (fb));
+ } else if (shell_view != CORBA_OBJECT_NIL) {
+ CORBA_Environment ev;
+
+ CORBA_exception_init (&ev);
+ GNOME_Evolution_ShellView_setFolderBarLabel (shell_view,
+ "",
+ &ev);
+ if (BONOBO_EX (&ev))
+ g_warning ("Exception in folder bar label clear: %s",
+ bonobo_exception_get_text (&ev));
+ CORBA_exception_free (&ev);
}
LOCK_FOLDERS ();
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 5f6dd7f2e2..1ca74631d0 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -363,10 +363,12 @@ do_update_subfolders_rec (CamelStore *store, CamelFolderInfo *info, EvolutionSto
{
char *path;
- /* info->url == URI??? */
- mail_folder_cache_set_update_estorage (info->url, storage);
- mail_folder_cache_note_folderinfo (info->url, info);
-
+ if (info->url) {
+ /* info->url == URI??? */
+ mail_folder_cache_set_update_estorage (info->url, storage);
+ mail_folder_cache_note_folderinfo (info->url, info);
+ }
+
path = g_strdup_printf("%s/%s", prefix, info->name);
if (info->child)