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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-26 10:02:21 +0300 (Tue, 26 Jun 2007)
New Revision: 12456

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
Log:

2007-06-26  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/hildon-home-area.c: Fixed build without composite



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-26 06:59:38 UTC (rev 12455)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-26 07:02:21 UTC (rev 12456)
@@ -1,3 +1,7 @@
+2007-06-26  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-area.c: Fixed build without composite
+
 2007-06-26  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildonwm/hd-wm.c: top desktop.

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-06-26 06:59:38 UTC (rev 12455)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-06-26 07:02:21 UTC (rev 12456)
@@ -57,13 +57,13 @@
 typedef struct
 {
   GtkWidget    *widget;
+  Window        window;
   gint          x;
   gint          y;
   gint          stack_index;
   gulong        realize_handler;
 #ifdef HAVE_X_COMPOSITE
   GtkAllocation old_allocation;
-  Window        window;
   Damage        damage;
   Picture       picture;
   Picture       alpha_mask;
@@ -249,6 +249,13 @@
 
 }
 
+static gint
+find_by_window (ChildData *data, Window *w)
+{
+  return !(data->window == *w);
+}
+
+
 GType
 hildon_home_area_get_type (void)
 {
@@ -1315,12 +1322,6 @@
 }
 
 
-static gint
-find_by_window (ChildData *data, Window *w)
-{
-  return !(data->window == *w);
-}
-
 static gboolean
 hildon_home_area_expose (GtkWidget *widget,
                          GdkEventExpose *event)
@@ -1548,6 +1549,8 @@
   gtk_container_child_get (GTK_CONTAINER (area), child,
                            "child-data", &data,
                            NULL);
+
+  data->window = GDK_WINDOW_XID (child->window);
 #ifdef HAVE_X_COMPOSITE
 
   /* HACK: Pretend the child shaped so GDK does not add the
@@ -2282,7 +2285,10 @@
                               area);
 
   if (GTK_WIDGET_REALIZED (widget))
-    hildon_home_area_sort_stack (area);
+    {
+      hildon_home_area_sort_stack (area);
+      child_data->window = GDK_WINDOW_XID (widget->window);
+    }
 
 #ifdef HAVE_X_COMPOSITE
   if (HILDON_HOME_AREA_GET_CLASS (area)->composite)