diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-folder-selector.c | 4 | ||||
| -rw-r--r-- | mail/mail-ops.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index dccbd90acb..934836ea96 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,12 @@ 2004-02-02 Not Zed <NotZed@Ximian.com> + ** See bug #53549. + + * em-folder-selector.c: Fix handling a parent path of "/". + + * mail-ops.c (mark_junk_mark): removed the really innacurate cut and + paste comment. This has nothing to do with filter_folder. + ** See bug #52994. * em-folder-properties.c (em_folder_properties_show): redirect diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 64f0b05da8..2d7c528df5 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -315,8 +315,8 @@ em_folder_selector_get_selected_uri (EMFolderSelector *emfs) camel_url_set_fragment (url, newpath); } else { - newpath = g_strdup_printf ("%s/%s", url->path ? url->path : "", name); - camel_url_set_path (url, newpath); + newpath = g_strdup_printf("%s/%s", (url->path == NULL || strcmp(url->path, "/") == 0) ? "":url->path, name); + camel_url_set_path(url, newpath); } g_free (emfs->selected_path); diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 61dde23060..10e40eafc5 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -2346,8 +2346,6 @@ mark_junk_describe (struct _mail_msg *mm, int complete) return g_strdup (_("Changing junk status")); } -/* filter a folder, or a subset thereof, uses source_folder/source_uids */ -/* this is shared with fetch_mail */ static void mark_junk_mark (struct _mail_msg *mm) { |