Remove autofocus adjustment in widgets autofocus doesn't help

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

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index a3d0433..6a7168c 100644 (file)
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -262,6 +262,7 @@ modest_hildon2_window_add_button_to_menu (ModestHildon2Window *self,
                                                            (GCallback) dimming_callback,
                                                            MODEST_WINDOW (self));
        hildon_app_menu_append (HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (button));
+       gtk_widget_show (GTK_WIDGET (button));
 }
 
 void 
@@ -499,12 +500,13 @@ edit_toolbar_button_clicked (HildonEditToolbar *toolbar,
 
        reg = (EditModeRegister *) g_hash_table_lookup (priv->edit_mode_registry, 
                                                        GINT_TO_POINTER (priv->edit_command));
-       if (reg == NULL)
-               modest_hildon2_window_unset_edit_mode (self);
 
-       if ((reg->action == NULL) || reg->action (self))
+       if (reg) {
+               if ((reg->action == NULL) || reg->action (self))
+                       modest_hildon2_window_unset_edit_mode (self);
+       } else {
                modest_hildon2_window_unset_edit_mode (self);
-
+       }
 }
 
 static void