fixes NB#61800

pmo-trunk-r3045

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 4a6522f..53ef29a 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -56,6 +56,17 @@
 #include <modest-widget-memory.h>
 #include <modest-ui-actions.h>
 
+#ifdef MODEST_PLATFORM_MAEMO
+#include <tny-maemo-conic-device.h>
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#include <hildon-widgets/hildon-note.h>
+#include <hildon-widgets/hildon-banner.h>
+#else
+#include <hildon/hildon-note.h>
+#include <hildon/hildon-banner.h>
+#endif
+#endif
+
 /* 'private'/'protected' functions */
 static void modest_folder_view_class_init  (ModestFolderViewClass *klass);
 static void modest_folder_view_init        (ModestFolderView *obj);
@@ -1484,6 +1495,18 @@ tree_path_to_folder (GtkTreeModel *model, GtkTreePath *path)
        return folder;
 }
 
+static void 
+show_banner_move_target_error ()
+{
+       ModestWindow *main_window;
+
+       main_window = modest_window_mgr_get_main_window(
+                       modest_runtime_get_window_mgr());
+                               
+       hildon_banner_show_information(GTK_WIDGET(main_window),
+                       NULL, _("mail_in_ui_folder_move_target_error"));
+}
+
 /*
  * This function is used by drag_data_received_cb to manage drag and
  * drop of a header, i.e, and drag from the header view to the folder
@@ -1527,6 +1550,7 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
        folder = tree_path_to_folder (dest_model, dest_row);
        if (!TNY_IS_FOLDER(folder)) {
                g_warning ("BUG: %s could not get a valid folder", __FUNCTION__);
+               show_banner_move_target_error();
                goto cleanup;
        }
        if (modest_tny_folder_get_rules(folder) & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index bbc5d52..d9df75a 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -1343,6 +1343,7 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
        source_row = get_selected_row (GTK_TREE_VIEW (widget), &model);
        
        if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
+
        switch (info) {
        case MODEST_HEADER_ROW:
                gtk_tree_set_row_drag_data (selection_data, model, source_row);