Remove autofocus handling with gtk_container in editor

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

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 03d0aec..4f77d83 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -888,8 +888,6 @@ init_window (ModestMsgEditWindow *obj)
        gtk_container_add (GTK_CONTAINER (window_align), main_vbox);
 
        hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), window_align);
-       gtk_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox), 
-                                            hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable)));
        gtk_widget_show_all (GTK_WIDGET(priv->pannable));
        
        window_box = gtk_vbox_new (FALSE, 0);
@@ -3476,8 +3474,10 @@ gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter,
                if (!g_utf8_collate (range_subtext, str_casefold)) {
                        gchar *found_text = g_strndup (range_text + offset, str_chars_n);
                        result = TRUE;
-                       gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY,
-                                                     match_start, match_end, NULL);
+                       if (!gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY,
+                                                          match_start, match_end, NULL)) {
+                               g_warning ("Matched string with collate, but not matched in model");
+                       }
                        g_free (found_text);
                }
                g_free (range_subtext);
@@ -3591,7 +3591,6 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
        g_return_if_fail ((draft == NULL)||(TNY_IS_MSG (draft)));
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
 
        if (priv->draft_msg != NULL) {
                g_object_unref (priv->draft_msg);
@@ -3605,12 +3604,6 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
                        priv->msg_uid = NULL;
                }
                priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
-               if (GTK_WIDGET_REALIZED (window)) {
-                       if (!modest_window_mgr_register_window (mgr, MODEST_WINDOW (window), NULL)) {
-                               gtk_widget_destroy (GTK_WIDGET (window));
-                               return;
-                       }
-               }
        }
 
        priv->draft_msg = draft;