From: Jose Dapena Paz <jdapena@igalia.com>
Date: Wed, 11 Jul 2007 16:52:45 +0000 (+0000)
Subject: * src/maemo/modest-msg-edit-window.c:
X-Git-Tag: git_migration_finished~2823
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=3fb640f014d7814de3e6823db2a1d5a7ea0a7170

* src/maemo/modest-msg-edit-window.c:
        * Reactivate the focus vadjustment
* src/widgets/modest-window.c:
        * Now escape sends a delete event to msg view and editor if
          they're not fullscreen (fixes NB#58618).

pmo-trunk-r2715
---

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 61e5109..74f4c85 100644
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -509,12 +509,8 @@ init_window (ModestMsgEditWindow *obj)
 	priv->scroll_area = modest_scroll_area_new (priv->scroll, priv->msg_body);
 	gtk_container_add (GTK_CONTAINER (frame), priv->scroll_area);
 	
-	/*
-	 TODO: scroll_area was never instantiated.
-	 Stop building without warnings-as-errors. murrayc.
-	gtk_container_set_focus_vadjustment (GTK_CONTAINER (scroll_area), 
+	gtk_container_set_focus_vadjustment (GTK_CONTAINER (priv->scroll_area), 
 					     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
-	*/
 
 	priv->clipboard_change_handler_id = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change",
 							      G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj);
diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index 0b4f849..eef669d 100644
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -336,6 +336,8 @@ on_key_pressed (GtkWidget *self,
  	case GDK_Escape: 
 		if (modest_window_mgr_get_fullscreen_mode (mgr))
 			modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
+		else if (MODEST_IS_MSG_VIEW_WINDOW (self)||MODEST_IS_MSG_EDIT_WINDOW (self))
+			modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));
 		break;
 	}