diff options
| -rw-r--r-- | shell/ChangeLog | 12 | ||||
| -rw-r--r-- | shell/e-shortcuts-view-model.c | 16 |
2 files changed, 22 insertions, 6 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 8c33dd7dca..1f78da058f 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,15 @@ +2001-06-28 Ettore Perazzoli <ettore@ximian.com> + + [Fix #3382, shortcut bar crashes when checking mail, and all the + different incarnations involving updates to an shortcut bar having + shortcuts to non-existent folders. Also, this fixes #1643, + shortcuts not visible until you enable an IMAP account, and #2436, + i.e. misbehavior of shortcut groups when IMAP or invalid shortcuts + are involved.] + + * e-shortcuts-view-model.c (load_group_into_model): Add the + shortcuts that point to folders that don't exist yet, too. + 2001-06-28 Dan Winship <danw@ximian.com> * e-storage.c (e_storage_new_folder): Call folder_changed_cb after diff --git a/shell/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c index 9f11cb0aad..69b417de9a 100644 --- a/shell/e-shortcuts-view-model.c +++ b/shell/e-shortcuts-view-model.c @@ -32,6 +32,8 @@ #include <glib.h> #include <gtk/gtksignal.h> +#include <libgnome/gnome-i18n.h> + #include <gal/util/e-util.h> @@ -93,16 +95,18 @@ load_group_into_model (EShortcutsViewModel *shortcuts_view_model, uri = (const char *) p->data; path = get_storage_set_path_from_uri (uri); - if (path != NULL) + + if (path == NULL) { + name = _("Unknown link"); + } else { folder = e_storage_set_get_folder (storage_set, path); - if (path == NULL || folder == NULL) { - /* FIXME */ - g_warning ("Invalid link while loading shortcut bar view -- %s", uri); - continue; + if (folder != NULL) + name = e_folder_get_name (folder); + else + name = g_basename (path); } - name = e_folder_get_name (folder); e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, -1, uri, name); } |