From 6bf0ba97e25261e2efc5c685c08cf52a75816d3b Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 20 Aug 2001 01:22:09 +0000 Subject: 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 --- shell/e-shortcuts.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'shell/e-shortcuts.c') diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index 7dbeaecc9b..5572207e60 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -338,7 +338,22 @@ load_shortcuts (EShortcuts *shortcuts, if (folder != NULL) { if (type != NULL) xmlFree (type); - type = g_strdup (e_folder_get_type_string (folder)); + type = xmlMemStrdup (e_folder_get_type_string (folder)); + } else { + EStorage *storage; + const char *storage_type; + + storage = e_storage_set_get_storage (priv->storage_set, + uri + E_SHELL_URI_PREFIX_LEN + 1); + if (type != NULL) + xmlFree (type); + + storage_type = e_storage_get_toplevel_node_type (storage); + + if (storage_type == NULL) + type = NULL; + else + type = xmlMemStrdup (storage_type); } } -- cgit