* Changed the signature of the refresh folder callback. This will allow us to know...

pmo-trunk-r2585

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 316274e..1674414 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -2179,7 +2179,7 @@ on_refresh_folder (TnyFolder   *folder,
        /* Call user defined callback, if it exists */
        if (helper->user_callback) {
                gdk_threads_enter ();
-               helper->user_callback (priv->source, folder, helper->user_data);
+               helper->user_callback (self, folder, helper->user_data);
                gdk_threads_leave ();
        }
 

diff --git a/src/modest-mail-operation.h b/src/modest-mail-operation.h
index d389dd6..2894a09 100644 (file)
--- a/src/modest-mail-operation.h
+++ b/src/modest-mail-operation.h
@@ -88,7 +88,8 @@ typedef void (*ErrorCheckingUserCallback) (ModestMailOperation *mail_op, gpointe
 /**
  * GetMsgAsyncUserCallback:
  *
- * @obj: a #GObject generic object which has created current mail operation.
+ * @mail_op: the current #ModestMailOperation.
+ * @header: a #TnyHeader summary item.
  * @msg: a #TnyMsg message retrieved by async operation.
  * @user_data: generic data passed to user defined function.
  *
@@ -117,7 +118,7 @@ typedef void (*XferMsgsAsynUserCallback) (const GObject *obj, gpointer user_data
 /**
  * RefreshAsyncUserCallback:
  *
- * @obj: a #GObject generic object which has created current mail operation.
+ * @mail_op: the current #ModestMailOperation.
  * @folder: a #TnyFolder which has been refreshed .
  * @user_data: generic data passed to user defined function.
  *
@@ -125,7 +126,7 @@ typedef void (*XferMsgsAsynUserCallback) (const GObject *obj, gpointer user_data
  * used as tinymail operation callback. The private function fills private 
  * fields of mail operation and calls user defined callback if it exists.
  */
-typedef void (*RefreshAsyncUserCallback) (const GObject *obj, 
+typedef void (*RefreshAsyncUserCallback) (ModestMailOperation *mail_op, 
                                          TnyFolder *folder, 
                                          gpointer user_data);
 

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 7799461..ea02866 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1484,7 +1484,7 @@ set_active_account_from_tny_account (TnyAccount *account,
 
 
 static void
-folder_refreshed_cb (const GObject *obj, 
+folder_refreshed_cb (ModestMailOperation *mail_op, 
                     TnyFolder *folder, 
                     gpointer user_data)
 {

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index ad8371a..970e98e 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -990,7 +990,7 @@ typedef struct {
 } SetFolderHelper;
 
 static void
-folder_refreshed_cb (const GObject *obj, 
+folder_refreshed_cb (ModestMailOperation *mail_op,
                     TnyFolder *folder, 
                     gpointer user_data)
 {
@@ -1003,7 +1003,7 @@ folder_refreshed_cb (const GObject *obj,
 
        /* User callback */
        if (info->cb)
-               info->cb (obj, folder, info->user_data);
+               info->cb (mail_op, folder, info->user_data);
 
        /* Start the folder count changes observer. We do not need it
           before the refresh. Note that the monitor could still be