Force to have at least first row selected in edit modes (fixes NB#98788).

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

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index 877910a..015dedc 100644 (file)
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -38,6 +38,7 @@
 #include <modest-window-priv.h>
 #include <modest-hildon2-window.h>
 #include <modest-ui-actions.h>
+#include "modest-text-utils.h"
 #include <hildon/hildon-edit-toolbar.h>
 
 typedef struct _EditModeRegister {
@@ -220,9 +221,8 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window)
 {
        g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW (window), FALSE);
 
-       hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
+       hildon_banner_show_information (NULL, NULL, _CS("ckct_ib_cannot_zoom_here"));
        return FALSE;
-
 }
 
 static void 
@@ -393,7 +393,18 @@ modest_hildon2_window_set_edit_mode (ModestHildon2Window *self,
 
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->current_edit_tree_view));
        gtk_tree_selection_set_mode (selection, reg->mode);
-       gtk_tree_selection_unselect_all (selection);
+       if (reg->mode == GTK_SELECTION_SINGLE || reg->mode == GTK_SELECTION_BROWSE) {
+               GtkTreeModel *model;
+               GtkTreeIter iter;
+
+               model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->current_edit_tree_view));
+               if (gtk_tree_model_get_iter_first (model, &iter)) {
+                       gtk_tree_view_scroll_to_point (GTK_TREE_VIEW (priv->current_edit_tree_view), 0, 0);
+                       gtk_tree_selection_select_iter (selection, &iter);
+               }
+       } else {
+               gtk_tree_selection_unselect_all (selection);
+       }
 
        priv->edit_toolbar = hildon_edit_toolbar_new ();
        hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),