Only notify for new headers without seen flag (fixes MB#3004)

[modest] / src / modest-ui-actions.c

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index f96f6cd..18468d8 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -2135,9 +2135,34 @@ new_messages_arrived (ModestMailOperation *self,
           send&receive was invoked by the user then do not show any
           visual notification, only play a sound and activate the LED
           (for the Maemo version) */
-       if (TNY_IS_LIST(new_headers) && (tny_list_get_length (new_headers)) > 0)
-               modest_platform_on_new_headers_received (new_headers,
-                                                        show_visual_notifications);
+       if (TNY_IS_LIST(new_headers) && (tny_list_get_length (new_headers)) > 0) {
+
+               /* We only notify about really new messages (not seen) we get */
+               TnyList *actually_new_list;
+               TnyIterator *iterator;
+               actually_new_list = TNY_LIST (tny_simple_list_new ());
+               for (iterator = tny_list_create_iterator (new_headers);
+                    !tny_iterator_is_done (iterator);
+                    tny_iterator_next (iterator)) {
+                       TnyHeader *header;
+                       TnyHeaderFlags flags;
+                       header = TNY_HEADER (tny_iterator_get_current (iterator));
+                       flags = tny_header_get_flags (header);
+
+                       if (!(flags & TNY_HEADER_FLAG_SEEN)) {
+                               tny_list_append (actually_new_list, G_OBJECT (header));
+                       }
+                       g_object_unref (header);
+                       
+               }
+               g_object_unref (iterator);
+
+               if (tny_list_get_length (actually_new_list) > 0) {
+                       modest_platform_on_new_headers_received (actually_new_list,
+                                                                show_visual_notifications);
+               }
+               g_object_unref (actually_new_list);
+       }
 
 }
 
@@ -3400,20 +3425,21 @@ do_create_folder (GtkWindow *parent_window,
 
 static void
 modest_ui_actions_create_folder(GtkWidget *parent_window,
-                                GtkWidget *folder_view)
+                                GtkWidget *folder_view,
+                               TnyFolderStore *parent_folder)
 {
-       TnyFolderStore *parent_folder;
-
+       if (!parent_folder) {
 #ifdef MODEST_TOOLKIT_HILDON2
-       ModestTnyAccountStore *acc_store;
+               ModestTnyAccountStore *acc_store;
 
-       acc_store = modest_runtime_get_account_store ();
+               acc_store = modest_runtime_get_account_store ();
 
-       parent_folder = (TnyFolderStore *)
-               modest_tny_account_store_get_local_folders_account (acc_store);
+               parent_folder = (TnyFolderStore *)
+                       modest_tny_account_store_get_local_folders_account (acc_store);
 #else
-       parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
+               parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
 #endif
+       }
 
        if (parent_folder) {
                do_create_folder (GTK_WINDOW (parent_window), parent_folder, NULL);
@@ -3435,13 +3461,13 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestWindow *window)
                if (!folder_view)
                        return;
 
-               modest_ui_actions_create_folder (GTK_WIDGET (window), folder_view);
+               modest_ui_actions_create_folder (GTK_WIDGET (window), folder_view, NULL);
 #ifdef MODEST_TOOLKIT_HILDON2
        } else if (MODEST_IS_FOLDER_WINDOW (window)) {
                GtkWidget *folder_view;
 
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
-               modest_ui_actions_create_folder (GTK_WIDGET (window), folder_view);
+               modest_ui_actions_create_folder (GTK_WIDGET (window), folder_view, NULL);
 #endif
        } else {
                g_assert_not_reached ();
@@ -4931,9 +4957,12 @@ on_move_to_dialog_response (GtkDialog *dialog,
 
        switch (response) {
                TnyFolderStore *dst_folder;
+               TnyFolderStore *selected;
 
        case MODEST_GTK_RESPONSE_NEW_FOLDER:
-               modest_ui_actions_create_folder (GTK_WIDGET (dialog), GTK_WIDGET (folder_view));
+               selected = modest_folder_view_get_selected (folder_view);
+               modest_ui_actions_create_folder (GTK_WIDGET (dialog), GTK_WIDGET (folder_view), selected);
+               g_object_unref (selected);
                return;
        case GTK_RESPONSE_NONE:
        case GTK_RESPONSE_CANCEL: