If the shortcut points to some folder in the storage set, get the type

* e-shortcuts.c (load_shortcuts): If the shortcut points to some
folder in the storage set, get the type from it.

* e-storage-set.c (signal_new_folder_for_all_folders_under_paths):
New helper function.
(signal_new_folder_for_all_folders_in_storage): New helper
function.
(e_storage_set_add_storage): Call the latter to emit a
"new_folder" signal for all the folders contained in the newly
added storage.

svn path=/trunk/; revision=11750

1 files changed, 11 insertions, 1 deletions

diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index 04899064f2..a6a35d49de 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -331,8 +331,18 @@ load_shortcuts (EShortcuts *shortcuts,
 			name = xmlGetProp (q, "name");
 			type = xmlGetProp (q, "type");
 			
-			shortcut_item = shortcut_item_new (uri, name, 0, type);
+			if (strncmp (uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0) {
+				EFolder *folder;
+
+				folder = e_storage_set_get_folder (priv->storage_set, uri + E_SHELL_URI_PREFIX_LEN);
+				if (folder != NULL) {
+					if (type != NULL)
+						xmlFree (type);
+					type = g_strdup (e_folder_get_type_string (folder));
+				}
+			}
 
+			shortcut_item = shortcut_item_new (uri, name, 0, type);
 			shortcut_group->shortcuts = g_slist_prepend (shortcut_group->shortcuts,
 								     shortcut_item);