diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 18 | ||||
| -rw-r--r-- | mail/component-factory.c | 4 | ||||
| -rw-r--r-- | mail/folder-browser.c | 4 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 2 | ||||
| -rw-r--r-- | mail/mail-ops.c | 5 | ||||
| -rw-r--r-- | mail/mail-ops.h | 1 |
6 files changed, 28 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 31fcf9e5a9..30746369db 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,23 @@ 2001-10-02 Jeffrey Stedfast <fejj@ximian.com> + * mail-callbacks.c (transfer_msg): Pass an empty flags argument to + mail_transfer_messages - destination folder should already be + created by this point. + + * folder-browser.c (message_list_drag_data_received): Pass an + empty flags argument to mail_transfer_messages. + (selection_received): Same. + + * component-factory.c (xfer_folder): Pass the CREATE flag to + mail_transfer_messages() so that the dest folder gets created. + (destination_folder_handle_drop): Update for mail-ops API change. + + * mail-ops.c (mail_transfer_messages): Now takes a dest_flags + argument that it passes along to mail_tool_uri_to_folder when + opening the destination folder. + +2001-10-02 Jeffrey Stedfast <fejj@ximian.com> + * mail-vfolder.c (vfolder_setup_do): Pass an empty flags argument to mail_tool_uri_to_folder. (vfolder_adduri_do): Same. diff --git a/mail/component-factory.c b/mail/component-factory.c index b34fcc77d9..bec7eb70c5 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -338,7 +338,7 @@ xfer_folder (EvolutionShellComponent *shell_component, uids = camel_folder_get_uids (source); mail_transfer_messages (source, uids, remove_source, destination_physical_uri, - xfer_folder_done, xfd); + CAMEL_STORE_FOLDER_CREATE, xfer_folder_done, xfd); camel_object_unref (CAMEL_OBJECT (source)); } else GNOME_Evolution_ShellComponentListener_notifyResult (listener, GNOME_Evolution_ShellComponentListener_INVALID_URI, &ev); @@ -575,7 +575,7 @@ destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *des mail_transfer_messages (folder, uids, action == GNOME_Evolution_ShellComponentDnd_ACTION_MOVE, - physical_uri, NULL, NULL); + physical_uri, 0, NULL, NULL); camel_object_unref (CAMEL_OBJECT (folder)); break; diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 9913363641..29509578ec 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -529,7 +529,7 @@ message_list_drag_data_received (ETree *tree, int row, ETreePath path, int col, } mail_transfer_messages (folder, uids, context->action == GDK_ACTION_MOVE, - fb->uri, NULL, NULL); + fb->uri, 0, NULL, NULL); camel_object_unref (CAMEL_OBJECT (folder)); break; @@ -640,7 +640,7 @@ selection_received (GtkWidget *widget, GtkSelectionData *selection_data, return; } - mail_transfer_messages (source, uids, FALSE, fb->uri, NULL, NULL); + mail_transfer_messages (source, uids, FALSE, fb->uri, 0, NULL, NULL); camel_object_unref (CAMEL_OBJECT (source)); } diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 449b21f35c..7ed4505918 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -1187,7 +1187,7 @@ transfer_msg (GtkWidget *widget, gpointer user_data, gboolean delete_from_source uids = g_ptr_array_new (); message_list_foreach (ml, enumerate_msg, uids); mail_transfer_messages (ml->folder, uids, delete_from_source, - physical, NULL, NULL); + physical, 0, NULL, NULL); } void diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 9f55bd2f0f..5c536d2adc 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -848,6 +848,7 @@ struct _transfer_msg { GPtrArray *uids; gboolean delete; char *dest_uri; + guint32 dest_flags; void (*done)(gboolean ok, void *data); void *data; @@ -881,7 +882,7 @@ transfer_messages_transfer (struct _mail_msg *mm) desc = _("Copying"); } - dest = mail_tool_uri_to_folder (m->dest_uri, 0, &mm->ex); + dest = mail_tool_uri_to_folder (m->dest_uri, m->dest_flags, &mm->ex); if (camel_exception_is_set (&mm->ex)) return; @@ -951,6 +952,7 @@ void mail_transfer_messages (CamelFolder *source, GPtrArray *uids, gboolean delete_from_source, const char *dest_uri, + guint32 dest_flags, void (*done) (gboolean ok, void *data), void *data) { @@ -966,6 +968,7 @@ mail_transfer_messages (CamelFolder *source, GPtrArray *uids, m->uids = uids; m->delete = delete_from_source; m->dest_uri = g_strdup (dest_uri); + m->dest_flags = dest_flags; m->done = done; m->data = data; diff --git a/mail/mail-ops.h b/mail/mail-ops.h index c4a134a192..cb91ecb832 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -46,6 +46,7 @@ void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMess void mail_transfer_messages (CamelFolder *source, GPtrArray *uids, gboolean delete_from_source, const char *dest_uri, + guint32 dest_flags, void (*done) (gboolean ok, void *data), void *data); |