* src/widgets/modest-window.c:

        * Fix keyboard handling.

pmo-trunk-r2528

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 86f1b90..25853f6 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -2360,7 +2360,7 @@ modest_ui_actions_on_undo (GtkAction *action,
 
        if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
                modest_msg_edit_window_undo (MODEST_MSG_EDIT_WINDOW (window));
 
        if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
                modest_msg_edit_window_undo (MODEST_MSG_EDIT_WINDOW (window));

-       } if (MODEST_IS_MAIN_WINDOW (window)) {
+       } else if (MODEST_IS_MAIN_WINDOW (window)) {

                /* Clear clipboard source */
                clipboard = modest_runtime_get_email_clipboard ();
                modest_email_clipboard_clear (clipboard);               
                /* Clear clipboard source */
                clipboard = modest_runtime_get_email_clipboard ();
                modest_email_clipboard_clear (clipboard);               

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index 194f4d0..43bf3ac 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -320,14 +320,17 @@ on_key_pressed (GtkWidget *self,
        switch (event->keyval) {
        case GDK_F6: 
                modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
        switch (event->keyval) {
        case GDK_F6: 
                modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));

+               return TRUE;

                break;
        case GDK_F7: 
                modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));
                break;
        case GDK_F7: 
                modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));

+               return TRUE;

                break;
        case GDK_F8: 
                modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self));
                break;
        case GDK_F8: 
                modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self));

+               return TRUE;

                break;
        }
        
                break;
        }
        

-       return TRUE;
+       return FALSE;

 }
 }