[maemo-commits] [maemo-commits] r11960 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-05-29 18:21:53 +0300 (Tue, 29 May 2007)
New Revision: 11960

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-home-window.c
Log:

2007-05-29  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-home-window.c: Do not cancel the layout mode when
	ESC is pressed if the layout mode sucks



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-29 15:16:45 UTC (rev 11959)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-29 15:21:53 UTC (rev 11960)
@@ -1,5 +1,10 @@
 2007-05-29  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-window.c: Do not cancel the layout mode when
+	ESC is pressed if the layout mode sucks
+
+2007-05-29  Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/hd-panel-window.c:
 	- paint the background and the children even if the composite
 	extension is not available

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-05-29 15:16:45 UTC (rev 11959)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-05-29 15:21:53 UTC (rev 11960)
@@ -842,13 +842,17 @@
 hd_home_window_key_press_event (GtkWidget *widget,
                                 GdkEventKey *event)
 {
+  HDHomeWindowPrivate  *priv;
+  priv = HD_HOME_WINDOW_GET_PRIVATE (widget);
+
   switch (event->keyval)
     {
       case HILDON_HARDKEY_MENU:
           hildon_home_window_toggle_menu (HILDON_HOME_WINDOW (widget));
           break;
       case HILDON_HARDKEY_ESC:
-          hd_home_window_cancel_layout (HD_HOME_WINDOW (widget));
+          if (!priv->layout_mode_sucks)
+            hd_home_window_cancel_layout (HD_HOME_WINDOW (widget));
 
           break;
       default: