* Partially fixes NB#85461, do not unload the folder before synchronizing it

[modest] / src / widgets / modest-header-view.c

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index 895ec95..aeddf0c 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -1268,8 +1268,10 @@ modest_header_view_set_folder (ModestHeaderView *self,
        }
                                                      
        if (priv->folder) {
-               if (priv->status_timeout)
+               if (priv->status_timeout) {
                        g_source_remove (priv->status_timeout);
+                       priv->status_timeout = 0;
+               }
 
                g_mutex_lock (priv->observers_lock);
                tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (self));
@@ -1782,22 +1784,40 @@ on_button_press_event(GtkWidget * self, GdkEventButton * event, gpointer userdat
        GtkTreeSelection *selection = NULL;
        GtkTreePath *path = NULL;
        gboolean already_selected = FALSE;
+       ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
 
        if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(self), event->x, event->y, &path, NULL, NULL, NULL)) {
+               GtkTreeIter iter;
+               GtkTreeModel *model;
+
                selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
                already_selected = gtk_tree_selection_path_is_selected (selection, path);
+
+               /* Get header from model */
+               model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+               if (gtk_tree_model_get_iter (model, &iter, path)) {
+                       GValue value = {0,};
+                       TnyHeader *header;
+
+                       gtk_tree_model_get_value (model, &iter, 
+                                                 TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+                                                 &value);
+                       header = (TnyHeader *) g_value_get_object (&value);
+                       if (TNY_IS_HEADER (header))
+                               status = modest_tny_all_send_queues_get_msg_status (header);
+                       g_value_unset (&value);
+               }
        }
 
        /* Enable drag and drop onlly if the user clicks on a row that
           it's already selected. If not, let him select items using
-          the pointer */
-       if (!already_selected) {
+          the pointer. If the message is in an outbos and in sending
+          status disable drag and drop as well */
+       if (!already_selected || status == MODEST_TNY_SEND_QUEUE_SENDING)
                disable_drag_and_drop(self);
-       }
 
-       if (path != NULL) {
+       if (path != NULL)
                gtk_tree_path_free(path);
-       }
 
        return FALSE;
 }
@@ -1971,6 +1991,10 @@ static void
 notify_filter_change_destroy (gpointer data)
 {
        NotifyFilterInfo *info = (NotifyFilterInfo *) data;
+       ModestHeaderViewPrivate *priv;
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (info->self);
+       priv->status_timeout = 0;
 
        g_object_unref (info->self);
        g_object_unref (info->folder);