From 5248c1282cdf4eed7193f6ac0827f4a68504400f Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 29 Aug 2001 00:21:44 +0000 Subject: Handle the case when there is no URI without crashing. Only add shortcuts * e-shortcuts.c (load_shortcuts): Handle the case when there is no URI without crashing. Only add shortcuts when they are evolution: URIs. svn path=/trunk/; revision=12506 --- shell/e-shortcuts.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'shell/e-shortcuts.c') diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index 6c35107be4..1f8f47b5a8 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -331,8 +331,8 @@ load_shortcuts (EShortcuts *shortcuts, uri = xmlNodeListGetString (doc, q->childs, 1); name = xmlGetProp (q, "name"); type = xmlGetProp (q, "type"); - - if (strncmp (uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0) { + + if (uri != NULL && 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); @@ -362,11 +362,11 @@ load_shortcuts (EShortcuts *shortcuts, name = xmlMemStrdup (e_storage_get_display_name (storage)); } } - } - shortcut_item = shortcut_item_new (uri, name, 0, type); - shortcut_group->shortcuts = g_slist_prepend (shortcut_group->shortcuts, - shortcut_item); + shortcut_item = shortcut_item_new (uri, name, 0, type); + shortcut_group->shortcuts = g_slist_prepend (shortcut_group->shortcuts, + shortcut_item); + } if (uri != NULL) xmlFree (uri); -- cgit v1.2.3