diff options
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/e-shortcuts.c | 29 |
2 files changed, 6 insertions, 29 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index bd4ed7411a..9166a7aef4 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2001-07-16 Ettore Perazzoli <ettore@ximian.com> + + * e-shortcuts.c + (override_shortcut_name_and_type_from_storage_set): Removed. + (load_shortcuts): Don't call it. + 2001-07-15 Ettore Perazzoli <ettore@ximian.com> [Fix #4387, Shortcut bar items don't keep the name after rename.] diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index dcc24fd3d0..7c8505ab79 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -232,30 +232,6 @@ update_shortcut_and_emit_signal (EShortcuts *shortcuts, } static void -override_shortcut_name_and_type_from_storage_set (EShortcuts *shortcuts, - EShortcutItem *shortcut_item) -{ - EShortcutsPrivate *priv; - EFolder *folder; - - priv = shortcuts->priv; - - /* If it is not an evolution: link, there is not much we can do. */ - if (strncmp (shortcut_item->uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) != 0) - return; - - folder = e_storage_set_get_folder (priv->storage_set, - shortcut_item->uri + E_SHELL_URI_PREFIX_LEN); - if (folder == NULL) - return; - - shortcut_item_update (shortcut_item, - shortcut_item->uri, - NULL, - e_folder_get_type_string (folder)); -} - -static void unload_shortcuts (EShortcuts *shortcuts) { EShortcutsPrivate *priv; @@ -337,11 +313,6 @@ load_shortcuts (EShortcuts *shortcuts, shortcut_item = shortcut_item_new (uri, name, type); - /* The name and type are the ones we saved from the - last session. If the folder is in the storage, we - have to get the type and name from this storage. */ - override_shortcut_name_and_type_from_storage_set (shortcuts, shortcut_item); - shortcut_group->shortcuts = g_slist_prepend (shortcut_group->shortcuts, shortcut_item); |