aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@novell.com>2004-06-16 05:49:47 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-06-16 05:49:47 +0800
commit8568b3caee7277c752d57e37430b8d76617e3ed3 (patch)
treedfcec83f89cdac4836387c87eed1cbc318d6f4aa
parente062a9f88dc9372254e690864f1aa0d4102bdbf4 (diff)
downloadgsoc2013-evolution-8568b3caee7277c752d57e37430b8d76617e3ed3.tar
gsoc2013-evolution-8568b3caee7277c752d57e37430b8d76617e3ed3.tar.gz
gsoc2013-evolution-8568b3caee7277c752d57e37430b8d76617e3ed3.tar.bz2
gsoc2013-evolution-8568b3caee7277c752d57e37430b8d76617e3ed3.tar.lz
gsoc2013-evolution-8568b3caee7277c752d57e37430b8d76617e3ed3.tar.xz
gsoc2013-evolution-8568b3caee7277c752d57e37430b8d76617e3ed3.tar.zst
gsoc2013-evolution-8568b3caee7277c752d57e37430b8d76617e3ed3.zip
frombase is simply the select_path, since selected_path is now just the
2004-06-15 Jeffrey Stedfast <fejj@novell.com> * em-folder-tree.c (emft_popup_copy_folder_selected): frombase is simply the select_path, since selected_path is now just the full_name rather than the path. Fixes bug #60075. svn path=/trunk/; revision=26357
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/em-folder-tree.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 515f5a70ce..5f6c1b5fcc 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,9 @@
2004-06-15 Jeffrey Stedfast <fejj@novell.com>
+ * em-folder-tree.c (emft_popup_copy_folder_selected): frombase is
+ simply the select_path, since selected_path is now just the
+ full_name rather than the path. Fixes bug #60075.
+
* em-composer-utils.c (attribution_format): New function to format
an attribution string (won't crash if translators were sloppy with
their strftime/printf-style formatters). Also nice/extendable for
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 8d82094c61..17e4fa5f8c 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2028,11 +2028,11 @@ emft_popup_copy_folder_selected (const char *uri, void *data)
priv = cfd->emft->priv;
- d(printf ("%sing folder '%s' to '%s'\n", cfd->delete ? "move" : "copy", priv->selected_path, uri));
+ printf ("%sing folder '%s' to '%s'\n", cfd->delete ? "move" : "copy", priv->selected_path, uri);
camel_exception_init (&ex);
- frombase = priv->selected_path + 1;
-
+ frombase = priv->selected_path;
+
if (!(fromstore = camel_session_get_store (session, priv->selected_uri, &ex))) {
e_error_run((GtkWindow *)gtk_widget_get_toplevel((GtkWidget *) cfd->emft),
cfd->delete?"mail:no-move-folder-notexist":"mail:no-copy-folder-notexist", frombase, uri, ex.desc, NULL);
@@ -2644,7 +2644,7 @@ emft_tree_button_press (GtkTreeView *treeview, GdkEventButton *event, EMFolderTr
flags |= EM_POPUP_FOLDER_FOLDER;
local = mail_component_peek_local_store (NULL);
-
+
/* don't allow deletion of special local folders */
if (!(store == local && is_special_local_folder (full_name)))
flags |= EM_POPUP_FOLDER_DELETE;