X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.h;h=c721541e8722c7d72e01e9138d1259a65cb7b7a6;hp=f86812a7eb54ec634048b83b21cfc0357c7f41d1;hb=25883ee2440d813f0b8adaf1a030c43e2afc075e;hpb=8b08d2fd3eebc0584a5c49abdcd26c52b65737f0

diff --git a/src/modest-mail-operation.h b/src/modest-mail-operation.h
index f86812a..c721541 100644
--- a/src/modest-mail-operation.h
+++ b/src/modest-mail-operation.h
@@ -33,6 +33,7 @@
 #include <tny-transport-account.h>
 #include <tny-folder-store.h>
 #include <widgets/modest-msg-edit-window.h>
+#include <modest-tny-send-queue.h>
 
 G_BEGIN_DECLS
 
@@ -69,9 +70,12 @@ typedef enum _ModestMailOperationStatus {
 typedef enum {
 	MODEST_MAIL_OPERATION_TYPE_SEND,
 	MODEST_MAIL_OPERATION_TYPE_RECEIVE,
+	MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE,
 	MODEST_MAIL_OPERATION_TYPE_OPEN,
 	MODEST_MAIL_OPERATION_TYPE_DELETE,
 	MODEST_MAIL_OPERATION_TYPE_INFO,
+	MODEST_MAIL_OPERATION_TYPE_RUN_QUEUE,
+	MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER,
 	MODEST_MAIL_OPERATION_TYPE_UNKNOWN,
 } ModestMailOperationTypeOperation;
 
@@ -129,16 +133,34 @@ typedef void (*GetMimePartSizeCallback) (ModestMailOperation *mail_op,
 					 gpointer user_data);
 
 /**
- * XferAsyncUserCallback:
+ * XferMsgsAsyncUserCallback:
  *
  * @obj: a #GObject generic object which has created current mail operation.
+ * @new_folder: the new instance of the #TnyFolder that has been transferred
  * @user_data: generic data passed to user defined function.
  *
  * This function will be called after transfer_msgs_cb private function, which is
  * used as tinymail operation callback. The private function fills private 
  * fields of mail operation and calls user defined callback if it exists.
  */
-typedef void (*XferAsyncUserCallback) (ModestMailOperation *mail_op, gpointer user_data);
+typedef void (*XferMsgsAsyncUserCallback) (ModestMailOperation *mail_op, 
+					   gpointer user_data);
+
+
+/**
+ * XferFolderAsyncUserCallback:
+ *
+ * @obj: a #GObject generic object which has created current mail operation.
+ * @new_folder: the new instance of the #TnyFolder that has been transferred
+ * @user_data: generic data passed to user defined function.
+ *
+ * This function will be called after transfer_msgs_cb private function, which is
+ * used as tinymail operation callback. The private function fills private 
+ * fields of mail operation and calls user defined callback if it exists.
+ */
+typedef void (*XferFolderAsyncUserCallback) (ModestMailOperation *mail_op, 
+					     TnyFolder *new_folder,
+					     gpointer user_data);
 
 
 /**
@@ -479,7 +501,9 @@ void          modest_mail_operation_remove_folder  (ModestMailOperation *self,
  **/
 void          modest_mail_operation_rename_folder  (ModestMailOperation *self,
 						    TnyFolder *folder, 
-						    const gchar *name);
+						    const gchar *name,
+						    XferFolderAsyncUserCallback user_callback,
+						    gpointer user_data);
 
 /**
  * modest_mail_operation_xfer_folder:
@@ -487,7 +511,7 @@ void          modest_mail_operation_rename_folder  (ModestMailOperation *self,
  * @folder: a #TnyFolder
  * @parent: the new parent of the folder as #TnyFolderStore
  * @delete_original: wheter or not delete the original folder
- * @user_callback: a #XferAsyncUserCallback function to call after tinymail callback execution.
+ * @user_callback: a #XferFolderAsyncUserCallback function to call after tinymail callback execution.
  * @user_data: generic user data which will be passed to @user_callback function.
  * 
  * Sets the given @folder as child of a provided #TnyFolderStore. This
@@ -504,7 +528,7 @@ void          modest_mail_operation_xfer_folder    (ModestMailOperation *self,
 						    TnyFolder *folder,
 						    TnyFolderStore *parent,
 						    gboolean delete_original,
-						    XferAsyncUserCallback user_callback,
+						    XferFolderAsyncUserCallback user_callback,
 						    gpointer user_data);
 						    
 
@@ -516,7 +540,7 @@ void          modest_mail_operation_xfer_folder    (ModestMailOperation *self,
  * @header_list: a #TnyList of #TnyHeader to transfer
  * @folder: the #TnyFolder where the messages will be transferred
  * @delete_original: whether or not delete the source messages
- * @user_callback: a #XferAsyncUserCallback function to call after tinymail callback execution.
+ * @user_callback: a #XferFolderAsyncUserCallback function to call after tinymail callback execution.
  * @user_data: generic user data which will be passed to @user_callback function.
  * 
  * Asynchronously transfers messages from their current folder to
@@ -544,7 +568,7 @@ void          modest_mail_operation_xfer_msgs      (ModestMailOperation *self,
 						    TnyList *header_list, 
 						    TnyFolder *folder,
 						    gboolean delete_original,
-						    XferAsyncUserCallback user_callback,
+						    XferMsgsAsyncUserCallback user_callback,
 						    gpointer user_data);
 
 /**
@@ -609,6 +633,31 @@ void          modest_mail_operation_get_msgs_full   (ModestMailOperation *self,
 						     gpointer user_data,
 						     GDestroyNotify notify);
 
+/**
+ * modest_mail_operation_run_queue:
+ * @self: a #ModestMailOperation
+ * @queue: a #ModestTnySendQueue
+ *
+ * This mail operation is special. It should be running every time the send queue
+ * is running (after queue-start), and we should notify end of the operation
+ * after queue-end. Then, we should only set this queue on queue-start signal, and
+ * it will clean up the operation (notify end) on queue-end.
+ */
+void          modest_mail_operation_run_queue       (ModestMailOperation *self,
+						     ModestTnySendQueue *queue);
+
+/**
+ * modest_mail_operation_sync_folder:
+ * @self: a #ModestMailOperation
+ * @folder: a #TnyFolder
+ * @expunge: a #gboolean
+ *
+ * mail operation wrapper around tny_folder_sync () method, to keep modest
+ * running while we do that sync operation.
+ */
+void          modest_mail_operation_sync_folder     (ModestMailOperation *self,
+						     TnyFolder *folder, gboolean expunge);
+
 /* Functions to control mail operations */
 /**
  * modest_mail_operation_get_task_done: