Use xmlMemStrdup() to override the type as it's expected to be allocated

* e-shortcuts.c (load_shortcuts): Use xmlMemStrdup() to override
the type as it's expected to be allocated by libxml later on.
Also, get the icon for the storage if the shortcut points to a
storage.

* e-storage-set-view.c (etree_icon_at): Don't special case the
Summary storage.  Rather, use `e_storage_get_toplevel_node_type()'
for getting the type of the node.

* e-shortcuts-view-model.c (get_icon_for_item): New helper
function.
(shortcuts_update_shortcut_cb): Use it.
(shortcuts_new_shortcut_cb): Use it.
(load_group_into_model): Use it.

svn path=/trunk/; revision=12232

1 files changed, 8 insertions, 0 deletions

diff --git a/shell/e-shortcuts.h b/shell/e-shortcuts.h
index 2fc412dfa9..2173b4457a 100644
--- a/shell/e-shortcuts.h
+++ b/shell/e-shortcuts.h
@@ -46,9 +46,17 @@ typedef struct _EShortcutsPrivate EShortcutsPrivate;
 typedef struct _EShortcutsClass   EShortcutsClass;
 
 struct _EShortcutItem {
+	/* URI of the shortcut.  */
 	char *uri;
+
+	/* Name of the shortcut.  */
 	char *name;
+
+	/* Folder type for the shortcut.  If the shortcut doesn't point to a
+	   folder, this is NULL.  */
 	char *type;
+
+	/* Number of unread items in the folder.  Zero if not a folder.  */
 	int unread_count;
 };
 typedef struct _EShortcutItem EShortcutItem;