aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-11-06 02:38:22 +0800
committerDan Winship <danw@src.gnome.org>2001-11-06 02:38:22 +0800
commit35eedfd6a15b275b98cb3d0b404b5d55cbc3d5bc (patch)
tree3100eb03daecf549b7c3d8944e18b0bd7b813d35
parent2a491e3594915857c2db6a35bfdb16d69f9aaad1 (diff)
downloadgsoc2013-evolution-35eedfd6a15b275b98cb3d0b404b5d55cbc3d5bc.tar
gsoc2013-evolution-35eedfd6a15b275b98cb3d0b404b5d55cbc3d5bc.tar.gz
gsoc2013-evolution-35eedfd6a15b275b98cb3d0b404b5d55cbc3d5bc.tar.bz2
gsoc2013-evolution-35eedfd6a15b275b98cb3d0b404b5d55cbc3d5bc.tar.lz
gsoc2013-evolution-35eedfd6a15b275b98cb3d0b404b5d55cbc3d5bc.tar.xz
gsoc2013-evolution-35eedfd6a15b275b98cb3d0b404b5d55cbc3d5bc.tar.zst
gsoc2013-evolution-35eedfd6a15b275b98cb3d0b404b5d55cbc3d5bc.zip
Set the shortcut name to be the folder name, not just the last component
* e-storage-set-view.c (set_e_shortcut_selection): Set the shortcut name to be the folder name, not just the last component of its path, which may be different. svn path=/trunk/; revision=14589
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-storage-set-view.c11
2 files changed, 11 insertions, 6 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 7e00ebb555..67a50256dd 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-05 Dan Winship <danw@ximian.com>
+
+ * e-storage-set-view.c (set_e_shortcut_selection): Set the
+ shortcut name to be the folder name, not just the last component
+ of its path, which may be different.
+
2001-11-01 Ettore Perazzoli <ettore@ximian.com>
* glade/evolution-startup-wizard.glade: `timezone-48.png', not
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c
index 4a01f70238..ad302c0d5f 100644
--- a/shell/e-storage-set-view.c
+++ b/shell/e-storage-set-view.c
@@ -569,9 +569,10 @@ set_e_shortcut_selection (EStorageSetView *storage_set_view,
GtkSelectionData *selection_data)
{
EStorageSetViewPrivate *priv;
+ ETreePath node;
+ EFolder *folder;
int shortcut_len;
char *shortcut;
- const char *trailing_slash;
const char *name;
g_assert (storage_set_view != NULL);
@@ -579,11 +580,9 @@ set_e_shortcut_selection (EStorageSetView *storage_set_view,
priv = storage_set_view->priv;
- trailing_slash = strrchr (priv->selected_row_path, '/');
- if (trailing_slash == NULL)
- name = NULL;
- else
- name = trailing_slash + 1;
+ node = lookup_node_in_hash (storage_set_view, priv->selected_row_path);
+ folder = get_folder_at_node (storage_set_view, node);
+ name = e_folder_get_name (folder);
/* FIXME: Get `evolution:' from somewhere instead of hardcoding it here. */