Fixes NB#130519, country selector picker is too slow

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

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index 5ed64c6..c11c9b5 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -493,12 +493,40 @@ static void
 on_mark_read_csm_activated (GtkMenuItem *item,
                            gpointer user_data)
 {
+       TnyHeader *header;
+       ModestHeaderWindow *self;
+       ModestHeaderWindowPrivate *priv;
+
+       self = (ModestHeaderWindow *) user_data;
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+       header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view,
+                                                      priv->x_coord, priv->y_coord);
+
+       if (header) {
+               tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
+               g_object_unref (header);
+       }
 }
 
 static void
 on_mark_unread_csm_activated (GtkMenuItem *item,
                              gpointer user_data)
 {
+       TnyHeader *header;
+       ModestHeaderWindow *self;
+       ModestHeaderWindowPrivate *priv;
+
+       self = (ModestHeaderWindow *) user_data;
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+       header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view,
+                                                      priv->x_coord, priv->y_coord);
+
+       if (header) {
+               tny_header_unset_flag (header, TNY_HEADER_FLAG_SEEN);
+               g_object_unref (header);
+       }
 }
 
 static GtkWidget *
@@ -525,6 +553,9 @@ create_header_view (ModestWindow *self, TnyFolder *folder)
        gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), delete_item);
        gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), mark_read_item);
        gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), mark_unread_item);
+       hildon_gtk_widget_set_theme_size (delete_item, MODEST_EDITABLE_SIZE);
+       hildon_gtk_widget_set_theme_size (mark_unread_item, MODEST_EDITABLE_SIZE);
+       hildon_gtk_widget_set_theme_size (mark_read_item, MODEST_EDITABLE_SIZE);
        gtk_widget_show_all (priv->csm_menu);
 
        /* Connect signals */
@@ -624,7 +655,7 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc
        priv->contents_view = hildon_pannable_area_new ();
        alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
-                                  0, 0,
+                                  HILDON_MARGIN_HALF, 0,
                                   HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
 
        /* We need to do this here to properly listen for mail
@@ -777,7 +808,12 @@ static void setup_menu (ModestHeaderWindow *self)
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
                                           APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_messages"), NULL,
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
+                                          dngettext(GETTEXT_PACKAGE,
+                                                    "mcen_me_move_message",
+                                                    "mcen_me_move_messages",
+                                                    2),
+                                          NULL,
                                           APP_MENU_CALLBACK (set_moveto_edit_mode),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_messages"), NULL,