diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 3 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index cbff28d1a9..2b72b91d2f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2000-09-15 Dan Winship <danw@helixcode.com> + * mail-callbacks.c (transfer_msg): Revert **Temp fix** from below + since the relevant shell bug has been fixed now. + * mail-ops.c (do_fetch_mail): Fix the sense of the "keep on server" check so we're not doing this backwards. Don't get_message_flags, because POP doesn't support it and it's diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 6ced34a5db..748127ce4c 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -478,20 +478,22 @@ transfer_msg (GtkWidget *widget, gpointer user_data, gboolean delete_from_source extern EvolutionShellClient *global_shell_client; static char *last = NULL; + if (last == NULL) + last = g_strdup (""); if (delete_from_source) desc = _("Move message(s) to"); else desc = _("Copy message(s) to"); - evolution_shell_client_user_select_folder (global_shell_client, - desc, /* last ? last : */ "", - allowed_types, &uri, &physical); + evolution_shell_client_user_select_folder (global_shell_client, + desc, + last, allowed_types, &uri, &physical); if (!uri) return; path = strchr (uri, '/'); - if (!last || (last && path && strcmp (last, path))) { + if (path && strcmp (last, path) != 0) { g_free (last); last = g_strdup (path); } |