projects / modest / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Reverted again the gdk_threads_enter/leave sentences:
[modest] / src / modest-mail-operation.c
diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 1e3cbe0..f88ff79 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -70,7 +70,8 @@ static void     get_msg_status_cb (GObject *obj,
                                   TnyStatus *status,  
                                   gpointer user_data);
 
-static void     modest_mail_operation_notify_end (ModestMailOperation *self);
+static void     modest_mail_operation_notify_end (ModestMailOperation *self,
+                                                 gboolean need_lock);
 
 static gboolean did_a_cancel = FALSE;
 
@@ -373,7 +374,7 @@ modest_mail_operation_cancel (ModestMailOperation *self)
        /* This emits progress-changed on which the mail operation queue is
         * listening, so the mail operation is correctly removed from the
         * queue without further explicit calls. */
-       modest_mail_operation_notify_end (self);
+       modest_mail_operation_notify_end (self, FALSE);
        
        return TRUE;
 }
@@ -522,7 +523,7 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
 
        /* TODO: do this in the handler of the "msg-sent"
           signal.Notify about operation end */
-       modest_mail_operation_notify_end (self);
+       modest_mail_operation_notify_end (self, FALSE);
 }
 
 void
@@ -657,7 +658,7 @@ end:
        if (folder)
                g_object_unref (G_OBJECT(folder));
 
-       modest_mail_operation_notify_end (self);
+       modest_mail_operation_notify_end (self, FALSE);
 }
 
 typedef struct 
@@ -840,17 +841,14 @@ idle_notify_progress_once (gpointer data)
 static gboolean
 idle_notify_update_account_queue (gpointer data)
 {
-       gdk_threads_enter ();
-
        ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
        ModestMailOperationPrivate *priv = NULL;
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op);
-       
-       modest_mail_operation_notify_end (mail_op);
-       g_object_unref (mail_op);
 
-       gdk_threads_leave ();
+       /* Do not need to block, the notify end will do it for us */    
+       modest_mail_operation_notify_end (mail_op, TRUE);
+       g_object_unref (mail_op);
 
        return FALSE;
 }
@@ -1227,7 +1225,7 @@ modest_mail_operation_update_account (ModestMailOperation *self,
        priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
        if (callback) 
                callback (self, 0, user_data);
-       modest_mail_operation_notify_end (self);
+       modest_mail_operation_notify_end (self, FALSE);
        return FALSE;
 }
 
@@ -1271,7 +1269,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
        }
 
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
+       modest_mail_operation_notify_end (self, FALSE);
 
        return new_folder;
 }
@@ -1326,7 +1324,7 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
 
  end:
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
+       modest_mail_operation_notify_end (self, FALSE);
 }
 
 static void
@@ -1360,7 +1358,8 @@ static void
 transfer_folder_cb (TnyFolder *folder, 
                    TnyFolderStore *into, 
                    gboolean cancelled, 
-                   TnyFolder *new_folder, GError **err, 
+                   TnyFolder *new_folder, 
+                   GError **err, 
                    gpointer user_data)
 {
        ModestMailOperation *self = NULL;
@@ -1388,11 +1387,9 @@ transfer_folder_cb (TnyFolder *folder,
        /* Free */
        g_object_unref (folder);
        g_object_unref (into);
-       if (new_folder != NULL)
-               g_object_unref (new_folder);
 
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
+       modest_mail_operation_notify_end (self, TRUE);
 }
 
 void
@@ -1431,7 +1428,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                             _("mail_in_ui_folder_move_target_error"));
 
                /* Notify the queue */
-               modest_mail_operation_notify_end (self);
+               modest_mail_operation_notify_end (self, FALSE);
        } else if (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
                /* Set status failed and set an error */
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
@@ -1440,7 +1437,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                             _("FIXME: parent folder does not accept new folders"));
 
                /* Notify the queue */
-               modest_mail_operation_notify_end (self);
+               modest_mail_operation_notify_end (self, FALSE);
        } else {
                /* Pick references for async calls */
                g_object_ref (folder);
@@ -1484,7 +1481,7 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
                             _("FIXME: unable to rename"));
 
                /* Notify about operation end */
-               modest_mail_operation_notify_end (self);
+               modest_mail_operation_notify_end (self, FALSE);
        } else {
                /* Rename. Camel handles folder subscription/unsubscription */
                TnyFolderStore *into;
@@ -1543,7 +1540,7 @@ void modest_mail_operation_get_msg (ModestMailOperation *self,
                             _("Error trying to get a message. No folder found for header"));
 
                /* Notify the queue */
-               modest_mail_operation_notify_end (self);
+               modest_mail_operation_notify_end (self, FALSE);
        }
 }
 
@@ -1596,7 +1593,7 @@ get_msg_cb (TnyFolder *folder,
        g_slice_free (GetMsgAsyncHelper, helper);
                
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self);        
+       modest_mail_operation_notify_end (self, TRUE);
 }
 
 static void     
@@ -1656,8 +1653,6 @@ typedef struct {
 static gboolean
 notify_get_msgs_full (gpointer data)
 {
-       gdk_threads_enter ();
-
        NotifyGetMsgsInfo *info;
 
        info = (NotifyGetMsgsInfo *) data;      
@@ -1670,8 +1665,6 @@ notify_get_msgs_full (gpointer data)
 
        g_slice_free (NotifyGetMsgsInfo, info);
 
-       gdk_threads_leave ();
-
        return FALSE;
 }
 
@@ -1682,21 +1675,20 @@ notify_get_msgs_full (gpointer data)
 static gboolean
 get_msgs_full_destroyer (gpointer data)
 {
-       gdk_threads_enter ();
-
        GetFullMsgsInfo *info;
 
        info = (GetFullMsgsInfo *) data;
 
-       if (info->notify)
+       if (info->notify) {
+               gdk_threads_enter ();   
                info->notify (info->user_data);
+               gdk_threads_leave ();
+       }
 
        /* free */
        g_object_unref (info->headers);
        g_slice_free (GetFullMsgsInfo, info);
 
-       gdk_threads_leave ();
-
        return FALSE;
 }
 
@@ -1857,7 +1849,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
                             MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT,
                             _("emev_ni_ui_imap_msg_size_exceed_error"));
                /* Remove from queue and free resources */
-               modest_mail_operation_notify_end (self);
+               modest_mail_operation_notify_end (self, FALSE);
                if (notify)
                        notify (user_data);
        }
@@ -1931,7 +1923,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
        g_object_unref (G_OBJECT (folder));
 
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
+       modest_mail_operation_notify_end (self, FALSE);
 }
 
 static void
@@ -2008,7 +2000,7 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer
        g_object_unref (folder);
 
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
+       modest_mail_operation_notify_end (self, TRUE);
 }
 
 void
@@ -2044,7 +2036,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
                             _("FIXME: folder does not accept msgs"));
                /* Notify the queue */
-               modest_mail_operation_notify_end (self);
+               modest_mail_operation_notify_end (self, FALSE);
                return;
        }
 
@@ -2111,9 +2103,9 @@ on_refresh_folder (TnyFolder   *folder,
  out:
        /* Call user defined callback, if it exists */
        if (helper->user_callback) {
-/*             gdk_threads_enter (); */
+               gdk_threads_enter ();
                helper->user_callback (priv->source, folder, helper->user_data);
-/*             gdk_threads_leave (); */
+               gdk_threads_leave ();
        }
 
        /* Free */
@@ -2122,7 +2114,7 @@ on_refresh_folder (TnyFolder   *folder,
        g_object_unref (folder);
 
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
+       modest_mail_operation_notify_end (self, TRUE);
 }
 
 static void
@@ -2196,7 +2188,8 @@ modest_mail_operation_refresh_folder  (ModestMailOperation *self,
  * callback).
  */
 static void
-modest_mail_operation_notify_end (ModestMailOperation *self)
+modest_mail_operation_notify_end (ModestMailOperation *self,
+                                 gboolean need_lock)
 {
        ModestMailOperationState *state;
        ModestMailOperationPrivate *priv = NULL;
@@ -2212,14 +2205,18 @@ modest_mail_operation_notify_end (ModestMailOperation *self)
        
        /* Set the account back to not busy */
        if (priv->account_name) {
-               modest_account_mgr_set_account_busy(modest_runtime_get_account_mgr(), priv->account_name,
-                                                                                                                                                               FALSE);
+               modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr(), 
+                                                    priv->account_name, FALSE);
                g_free(priv->account_name);
                priv->account_name = NULL;
        }
        
        /* Notify the observers about the mail opertation end */
        state = modest_mail_operation_clone_state (self);
+       if (need_lock)
+               gdk_threads_enter ();
        g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+       if (need_lock)
+               gdk_threads_leave ();
        g_slice_free (ModestMailOperationState, state);
 }
"modest" is a lean & mean e-mail program.