From 35eedfd6a15b275b98cb3d0b404b5d55cbc3d5bc Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 5 Nov 2001 18:38:22 +0000 Subject: 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 --- shell/ChangeLog | 6 ++++++ shell/e-storage-set-view.c | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'shell') 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 + + * 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 * 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. */ -- cgit