avoid some critical warning on d&d

pmo-trunk-r3038

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 46e2c26..4a6522f 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -1500,6 +1500,7 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
        TnyFolder *folder = NULL;
        ModestMailOperation *mail_op = NULL;
        GtkTreeIter source_iter;
+       ModestWindowMgr *mgr = NULL;
 
        g_return_if_fail (GTK_IS_TREE_MODEL(source_model));
        g_return_if_fail (GTK_IS_TREE_MODEL(dest_model));
@@ -1516,6 +1517,12 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
                goto cleanup;
        }
        
+       /* Check if the selected message is in msg-view. If it is than
+        * do not enable drag&drop on that. */
+       mgr = modest_runtime_get_window_mgr ();
+       if (modest_window_mgr_find_registered_header(mgr, header, NULL))
+               goto cleanup;
+       
        /* Get Folder */
        folder = tree_path_to_folder (dest_model, dest_row);
        if (!TNY_IS_FOLDER(folder)) {

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index c925f6f..bbc5d52 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -1339,19 +1339,10 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
        GtkTreeIter iter;
        GtkTreePath *source_row = NULL;
        GtkTreeSelection *sel = NULL;   
-       ModestWindowMgr *mgr = NULL;
-       TnyHeader *header = NULL;
        
        source_row = get_selected_row (GTK_TREE_VIEW (widget), &model);
        
        if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
-       gtk_tree_model_get (model, &iter,
-                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-                           &header, -1);
-       mgr = modest_runtime_get_window_mgr ();
-       if (modest_window_mgr_find_registered_header(mgr, header, NULL))
-               return;
-
        switch (info) {
        case MODEST_HEADER_ROW:
                gtk_tree_set_row_drag_data (selection_data, model, source_row);