X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-window.c;h=acf9d909df461984e97ac044501db7f34a694be6;hp=c0e78302185c8e840759b8b3540e10d0025a27f8;hb=f6d386ff93e929092ba105385a29d760aeba9ff7;hpb=2b58f5abfb171a82424c14cd9777ea5ee460db61

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index c0e7830..acf9d90 100644
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -33,6 +33,7 @@
 #include "modest-tny-platform-factory.h"
 #include "modest-runtime.h"
 #include "modest-window-mgr.h"
+#include "modest-defs.h"
 #include <string.h> /* for strcmp */
 #include <gdk/gdkkeysyms.h>
 
@@ -87,7 +88,7 @@ modest_window_get_type (void)
 			(GInstanceInitFunc) modest_window_init,
 			NULL
 		};
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
 		parent_type = HILDON_TYPE_WINDOW;
 #else
 		parent_type = GTK_TYPE_WINDOW;
@@ -424,7 +425,7 @@ 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))
+		else if (MODEST_IS_MSG_VIEW_WINDOW (self))
 			modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));
 		break;
 	}