callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also use the display name for the storage.

Browse Source 
* e-shortcuts.c (load_shortcuts): Also use the display name for
the storage.

svn path=/trunk/; revision=12233
This commit is contained in:
Ettore Perazzoli
2001-08-20 01:27:59 +00:00
parent 6bf0ba97e2
commit e135a96c07
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shell/ChangeLog
View File

@ -1,3 +1,8 @@
2001-08-19 Ettore Perazzoli <ettore@ximian.com>
* e-shortcuts.c (load_shortcuts): Also use the display name for
the storage.
2001-08-19 Ettore Perazzoli <ettore@ximian.com>
* e-shortcuts.c (load_shortcuts): Use xmlMemStrdup() to override

20
shell/e-shortcuts.c
View File

@ -345,15 +345,21 @@ load_shortcuts (EShortcuts *shortcuts,
storage = e_storage_set_get_storage (priv->storage_set,
uri + E_SHELL_URI_PREFIX_LEN + 1);
if (type != NULL)
xmlFree (type);
if (storage != NULL) {
if (type != NULL)
xmlFree (type);
storage_type = e_storage_get_toplevel_node_type (storage);
storage_type = e_storage_get_toplevel_node_type (storage);
if (storage_type == NULL)
type = NULL;
else
type = xmlMemStrdup (storage_type);
if (storage_type == NULL)
type = NULL;
else
type = xmlMemStrdup (storage_type);
if (name != NULL)
xmlFree (name);
name = xmlMemStrdup (e_storage_get_display_name (storage));
}
}
}