[maemo-commits] [maemo-commits] r8794 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2006-12-18 11:08:13 +0200 (Mon, 18 Dec 2006)
New Revision: 8794

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c
Log:

2006-12-18  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/hildon-home-window.c:
	- set the applet area as the legitimate child
	- fixed allocation of the applet area



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-12-15 17:09:52 UTC (rev 8793)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-12-18 09:08:13 UTC (rev 8794)
@@ -1,3 +1,9 @@
+2006-12-18  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-window.c:
+	- set the applet area as the legitimate child
+	- fixed allocation of the applet area
+
 2006-12-15  Moises Martinez <moises.martinzes at nokia.com>
 
 	* test/test4.c: test updated with refactored appswitcher.

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c	2006-12-15 17:09:52 UTC (rev 8793)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c	2006-12-18 09:08:13 UTC (rev 8794)
@@ -770,7 +770,7 @@
 
   if (GTK_IS_WIDGET (priv->applet_area))
     {
-      child_allocation.y = child_allocation.height;
+      child_allocation.y += child_allocation.height;
       child_allocation.height = priv->work_area->height -
                                 child_allocation.height;
 
@@ -900,9 +900,10 @@
   
   g_object_ref (priv->applet_area);
   gtk_object_sink (GTK_OBJECT (priv->applet_area));
+  gtk_widget_set_parent (priv->applet_area, widget);
   gtk_widget_show (priv->applet_area);
-  gtk_widget_set_parent (priv->applet_area, widget);
 
+  GTK_BIN (widget)->child = priv->applet_area;
   HILDON_DESKTOP_WINDOW (window)->container = GTK_CONTAINER (priv->applet_area);
   
   g_signal_connect (priv->applet_area, "layout-mode-start",