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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-09-07 16:30:17 +0300 (Fri, 07 Sep 2007)
New Revision: 13675

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
Log:
2007-09-07  Moises Martinez  <moises.martinez at nokia.com>

        * libhildondesktop/hildon-desktop-panel-expandable.c:
        (hildon_desktop_panel_expandable_hide_extension),
        (hildon_desktop_panel_close_fullscreen),
        (hildon_desktop_panel_expandable_constructor):
        - Check the fullscreen signal to close the extension panel.
        Fixes: NB#68729
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-07 13:12:11 UTC (rev 13674)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-07 13:30:17 UTC (rev 13675)
@@ -1,3 +1,12 @@
+2007-09-07  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildondesktop/hildon-desktop-panel-expandable.c:
+	(hildon_desktop_panel_expandable_hide_extension),
+	(hildon_desktop_panel_close_fullscreen),
+	(hildon_desktop_panel_expandable_constructor):
+	- Check the fullscreen signal to close the extension panel.
+	Fixes: NB#68729
+
 2007-09-07 Johan Bilien  <johan.bilien at nokia.com>
 
 	* data/top-panel.conf.in, data/bottom-panel.conf.in: added

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-09-07 13:12:11 UTC (rev 13674)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-09-07 13:30:17 UTC (rev 13675)
@@ -40,6 +40,8 @@
 #define SYSTEM_TRAY_CANCEL_MESSAGE  2
 #endif
 
+#include <libhildonwm/hd-wm.h>
+
 #define STATUSBAR_DEBUG 0
 #if (STATUSBAR_DEBUG)
 #define sb_debug(o,a...) g_debug("sb: " o,##a)
@@ -235,7 +237,11 @@
   gdk_pointer_ungrab (GDK_CURRENT_TIME);
   gdk_keyboard_ungrab (GDK_CURRENT_TIME);
 
-  g_object_set (panel->priv->arrow, "active", FALSE, NULL);
+  if (!HILDON_DESKTOP_IS_PANEL_EXPANDABLE (panel))
+    return;
+	  
+  if (panel->priv->arrow && GTK_IS_WIDGET (panel->priv->arrow))
+    g_object_set (panel->priv->arrow, "active", FALSE, NULL);
 
   gtk_grab_remove (GTK_WIDGET (panel->priv->extension_window));
 
@@ -319,6 +325,17 @@
   return TRUE;
 }
 
+static void 
+hildon_desktop_panel_close_fullscreen (HDWM *hdwm, 
+				       gboolean fullscreen, 
+				       HildonDesktopPanelExpandable *panel)
+{
+  if (fullscreen)
+  {
+    hildon_desktop_panel_expandable_hide_extension (panel);	    
+  }	  
+}
+
 static GObject *
 hildon_desktop_panel_expandable_constructor (GType gtype,
 			                     guint n_params, 
@@ -402,6 +419,14 @@
 		          G_CALLBACK (hildon_desktop_panel_expandable_init_systray),
 		          NULL);
 #endif
+
+  HDWM *hdwm = hd_wm_get_singleton ();
+
+  g_signal_connect (hdwm, 
+		    "fullscreen",
+		    G_CALLBACK (hildon_desktop_panel_close_fullscreen),
+		    (gpointer)panel);
+  
   return object;
 }