[maemo-commits] [maemo-commits] r12526 - in projects/haf/trunk/hildon-desktop: . libhildondesktop libhildonwm

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-06-28 12:30:11 +0300 (Thu, 28 Jun 2007)
New Revision: 12526

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
Log:
2007-06-28  Moises Martinez  <moises.martinez at nokia.com>

        * libhildondesktop/hildon-desktop-popup-window.c:
        - Set the window as temporary.
        * libhildonwm/hd-wm.c:
        - When sending long key press, close all temporary windows.
        Fixes: NB#61291
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-28 09:22:35 UTC (rev 12525)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-28 09:30:11 UTC (rev 12526)
@@ -1,3 +1,11 @@
+2007-06-28  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildondesktop/hildon-desktop-popup-window.c:
+	- Set the window as temporary.
+	* libhildonwm/hd-wm.c:
+	- When sending long key press, close all temporary windows.
+	Fixes: NB#61291
+
 2007-06-27  Johan Bilien  <johan.bilien at nokia.com>
 
 	* background-manager/Makefile.am:

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c	2007-06-28 09:22:35 UTC (rev 12525)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c	2007-06-28 09:30:11 UTC (rev 12526)
@@ -88,6 +88,9 @@
 static gboolean hildon_desktop_popup_window_visibility_notify (GtkWidget          *widget,
 				                               GdkEventVisibility *event,
 			        		               gpointer            data);
+static gboolean hildon_desktop_popup_window_delete_event (GtkWidget *widget,
+							  GdkEvent  *event,
+							  gpointer   data);
 #endif
 static gboolean hildon_desktop_popup_window_composited_leave_notify (GtkWidget *widget,
 						     		     GdkEventCrossing *event,
@@ -255,6 +258,8 @@
 #else
   GTK_WINDOW (popup)->type = GTK_WINDOW_TOPLEVEL;
 
+  gtk_window_set_temporary (GTK_WINDOW (popup), TRUE);
+
   gtk_window_set_decorated (GTK_WINDOW (popup), FALSE);
   gtk_widget_add_events (GTK_WIDGET (popup), GDK_VISIBILITY_NOTIFY_MASK);
 #endif
@@ -266,6 +271,11 @@
 		    "visibility-notify-event",
 		    G_CALLBACK (hildon_desktop_popup_window_visibility_notify),
 		    NULL);
+
+  g_signal_connect (popup,
+		    "delete-event",
+		    G_CALLBACK (hildon_desktop_popup_window_delete_event),
+		    NULL);
 #endif
   gtk_widget_push_composite_child ();
 
@@ -613,6 +623,16 @@
 
   return FALSE;
 }
+
+static gboolean 
+hildon_desktop_popup_window_delete_event (GtkWidget *widget,
+					  GdkEvent *event,
+					  gpointer data)
+{ 
+  hildon_desktop_popup_window_popdown (HILDON_DESKTOP_POPUP_WINDOW (widget));
+  
+  return TRUE;
+}
 #endif
 static gboolean
 hildon_desktop_popup_window_composited_button_release (GtkWidget *widget,

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-06-28 09:22:35 UTC (rev 12525)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-06-28 09:30:11 UTC (rev 12526)
@@ -710,7 +710,9 @@
   if (g_str_equal (HOME_LONG_PRESS, member) && !hd_wm_modal_windows_present())
   {
     g_signal_emit_by_name (hdwm, "long-key-press");
-
+    
+    gdk_close_all_temporary_windows ();
+    
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
   }