diff options
| -rw-r--r-- | shell/ChangeLog | 9 | ||||
| -rw-r--r-- | shell/e-local-storage.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-folder-commands.c | 7 |
3 files changed, 15 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 48095961a6..548859d095 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,12 @@ +2001-08-13 Jason Leach <jleach@ximian.com> + + * e-local-storage.c (remove_folder_directory): Remove unused + variable @folder. + + * e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar): + Give icons to shortcuts added via Right-click->Add to Shortcut + Bar. + 2001-08-12 Ettore Perazzoli <ettore@ximian.com> * e-shell-folder-selection-dialog.c diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index 8c23c8659e..566980a175 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -450,7 +450,6 @@ remove_folder_directory (ELocalStorage *local_storage, { EStorage *storage; ELocalStoragePrivate *priv; - EFolder *folder; const char *folder_name; char *file_name; char *physical_path; @@ -458,7 +457,6 @@ remove_folder_directory (ELocalStorage *local_storage, priv = local_storage->priv; storage = E_STORAGE (local_storage); - folder = e_storage_get_folder (storage, path); folder_name = g_basename (path); /* Delete the metadata file associated with this folder. */ diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c index 5eed7fcc3e..afc775a5ab 100644 --- a/shell/e-shell-folder-commands.c +++ b/shell/e-shell-folder-commands.c @@ -565,6 +565,8 @@ e_shell_command_add_to_shortcut_bar (EShell *shell, EShellView *shell_view) { EShortcuts *shortcuts; + EStorageSet *storage_set; + EFolder *folder; int group_num; const char *uri; int unread_count; @@ -580,5 +582,8 @@ e_shell_command_add_to_shortcut_bar (EShell *shell, unread_count = get_folder_unread (shell, e_shell_view_get_current_path (shell_view)); - e_shortcuts_add_shortcut (shortcuts, group_num, -1, uri, NULL, unread_count, NULL); + storage_set = e_shell_get_storage_set (shell); + folder = e_storage_set_get_folder (storage_set, e_shell_view_get_current_path (shell_view)); + + e_shortcuts_add_shortcut (shortcuts, group_num, -1, uri, NULL, unread_count, e_folder_get_type_string (folder)); } |