aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-02-19 04:52:38 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-02-19 04:52:38 +0800
commit6f2a8a88d90bcec610b4391d7b5fbf81f5561cfe (patch)
treee005eff005471f230e0947c90dee9a9d0df38882
parent1907e1a2d78a04c760d9e4ef9479447186ef1aa2 (diff)
downloadgsoc2013-evolution-6f2a8a88d90bcec610b4391d7b5fbf81f5561cfe.tar
gsoc2013-evolution-6f2a8a88d90bcec610b4391d7b5fbf81f5561cfe.tar.gz
gsoc2013-evolution-6f2a8a88d90bcec610b4391d7b5fbf81f5561cfe.tar.bz2
gsoc2013-evolution-6f2a8a88d90bcec610b4391d7b5fbf81f5561cfe.tar.lz
gsoc2013-evolution-6f2a8a88d90bcec610b4391d7b5fbf81f5561cfe.tar.xz
gsoc2013-evolution-6f2a8a88d90bcec610b4391d7b5fbf81f5561cfe.tar.zst
gsoc2013-evolution-6f2a8a88d90bcec610b4391d7b5fbf81f5561cfe.zip
(shortcut_item_new): Get the name from the name,
not the type. Fixes #37952, pointed out by Lonnie Borntreger. svn path=/trunk/; revision=19935
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shortcuts.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 0cf9b331fa..b9b900caf7 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-18 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-shortcuts.c (shortcut_item_new): Get the name from the name,
+ not the type. Fixes #37952, pointed out by Lonnie Borntreger.
+
2003-02-17 Chris Toshok <toshok@ximian.com>
* e-shortcuts.c (load_shortcuts): plug memory leak - free path.
diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index b950f2ce44..5def82dcdb 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -138,7 +138,7 @@ shortcut_item_new (const char *uri,
if (name == NULL)
new->name = g_path_get_basename (uri);
else
- new->name = g_strdup (type);
+ new->name = g_strdup (name);
new->uri = g_strdup (uri);
new->type = g_strdup (type);