fixes NB#63563

pmo-trunk-r3057

diff --git a/src/modest-progress-object.c b/src/modest-progress-object.c
index 780543f..a13fe99 100644 (file)
--- a/src/modest-progress-object.c
+++ b/src/modest-progress-object.c
@@ -68,7 +68,7 @@ modest_progress_object_cancel_all_operations (ModestProgressObject *self)
 guint
 modest_progress_object_num_pending_operations (ModestProgressObject *self) 
 {
 guint
 modest_progress_object_num_pending_operations (ModestProgressObject *self) 
 {

-       g_return_if_fail (MODEST_IS_PROGRESS_OBJECT(self));
+       g_return_val_if_fail (MODEST_IS_PROGRESS_OBJECT(self), 0);

        
        return MODEST_PROGRESS_OBJECT_GET_IFACE (self)->num_pending_operations_func (self);
 }
        
        return MODEST_PROGRESS_OBJECT_GET_IFACE (self)->num_pending_operations_func (self);
 }

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 989c03a..064e427 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -1622,8 +1622,14 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
                        forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE;
                        if (forbidden)
                                g_debug ("folder rules: cannot move that folder");
                        forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE;
                        if (forbidden)
                                g_debug ("folder rules: cannot move that folder");

+                       else
+                               /* Dragging and dropping of remote folders to local
+                                * should not possible. Fixes NB#63563 */
+                               forbidden = modest_tny_folder_is_remote_folder(
+                                               folder);

                        g_object_unref (folder);
                }
                        g_object_unref (folder);
                }

+

        }
 
        
        }