Sync the flags of messages read from notifications

[modest] / src / hildon2 / modest-folder-window.c

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 22d8b1c..2750834 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -47,6 +47,7 @@
 #include <hildon/hildon-banner.h>
 #include <hildon/hildon-button.h>
 #include <tny-account-store-view.h>
+#include <tny-gtk-folder-list-store.h>
 #include <modest-header-window.h>
 #include <modest-ui-dimming-rules.h>
 #include <modest-ui-dimming-manager.h>
@@ -65,6 +66,7 @@ typedef enum {
 static void modest_folder_window_class_init  (ModestFolderWindowClass *klass);
 static void modest_folder_window_init        (ModestFolderWindow *obj);
 static void modest_folder_window_finalize    (GObject *obj);
+static void modest_folder_window_dispose     (GObject *obj);
 
 static void connect_signals (ModestFolderWindow *self);
 static void modest_folder_window_disconnect_signals (ModestWindow *self);
@@ -106,6 +108,9 @@ static void on_visible_account_changed (ModestFolderView *folder_view,
 static void on_account_changed (TnyAccountStore *account_store,
                                TnyAccount *account,
                                gpointer user_data);
+static gboolean on_key_press(GtkWidget *widget,
+                               GdkEventKey *event,
+                               gpointer user_data);
 
 typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate;
 struct _ModestFolderWindowPrivate {
@@ -164,6 +169,7 @@ modest_folder_window_class_init (ModestFolderWindowClass *klass)
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_folder_window_finalize;
+       gobject_class->dispose = modest_folder_window_dispose;
 
        g_type_class_add_private (gobject_class, sizeof(ModestFolderWindowPrivate));
        
@@ -212,6 +218,47 @@ modest_folder_window_finalize (GObject *obj)
 }
 
 static void
+modest_folder_window_dispose (GObject *obj)
+{
+       ModestFolderWindowPrivate *priv;
+
+       priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(obj);
+       if (priv->folder_view) {
+               TnyList *list;
+
+               list = modest_folder_view_get_model_tny_list (MODEST_FOLDER_VIEW (priv->folder_view));
+
+               if (list) {
+                       TnyIterator *iter;
+
+                       iter = tny_list_create_iterator (list);
+                       while (!tny_iterator_is_done (iter)) {
+                               GObject *item = tny_iterator_get_current (iter);
+
+                               if (TNY_IS_ACCOUNT (item)) {
+                                       if (TNY_IS_FOLDER_STORE (item) && 
+                                           modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (item))) {
+                                               tny_account_cancel (TNY_ACCOUNT (item));
+                                       }
+                               }
+                               g_object_unref (item);
+                               tny_iterator_next (iter);
+                       }
+                       g_object_unref (iter);
+               }
+
+               if (list && TNY_IS_GTK_FOLDER_LIST_STORE (list)) {
+                       g_object_run_dispose (G_OBJECT (list));
+               }
+
+               g_object_unref (list);
+               priv->folder_view = NULL;
+       }       
+
+       G_OBJECT_CLASS(parent_class)->dispose (obj);
+}
+
+static void
 modest_folder_window_disconnect_signals (ModestWindow *self)
 {
        ModestFolderWindowPrivate *priv;
@@ -262,6 +309,10 @@ connect_signals (ModestFolderWindow *self)
                                                       G_OBJECT (modest_runtime_get_account_store()),
                                                       "account-changed",
                                                       G_CALLBACK (on_account_changed), self);
+
+
+       g_signal_connect(G_OBJECT(self), "key-press-event",
+                       G_CALLBACK(on_key_press), self);
 }
 
 ModestWindow *
@@ -523,8 +574,12 @@ setup_menu (ModestFolderWindow *self)
                                           APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
 
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_account"), NULL,
-                                          APP_MENU_CALLBACK (edit_account),
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
+                                          dngettext(GETTEXT_PACKAGE,
+                                                    "mcen_me_edit_account",
+                                                    "mcen_me_edit_accounts",
+                                                    1),
+                                          NULL, APP_MENU_CALLBACK (edit_account),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts));
 }
 
@@ -877,3 +932,31 @@ on_account_changed (TnyAccountStore *account_store,
        if (acc_id && visible && !g_utf8_collate (acc_id, visible))
                update_window_title (MODEST_FOLDER_WINDOW (user_data), account);
 }
+
+
+static gboolean
+on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+{
+       ModestFolderWindowPrivate *priv;
+       HildonPannableArea *pannable;
+
+       if (event->type == GDK_KEY_RELEASE)
+               return FALSE;
+
+       priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (user_data);
+
+       pannable = HILDON_PANNABLE_AREA (gtk_widget_get_parent (priv->folder_view));
+
+       switch (event->keyval) {
+
+       case GDK_Up:
+               modest_maemo_utils_scroll_pannable(pannable, 0, -1);
+               break;
+
+       case GDK_Down:
+               modest_maemo_utils_scroll_pannable(pannable, 0, 1);
+               break;
+       }
+
+       return FALSE;
+}