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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-04-04 18:18:17 +0300 (Wed, 04 Apr 2007)
New Revision: 10969

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

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

	* libhildondesktop/hildon-home-area.c: Fixed an illegal free



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-04 14:32:58 UTC (rev 10968)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-04 15:18:17 UTC (rev 10969)
@@ -1,3 +1,7 @@
+2007-04-04  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-area.c: Fixed an illegal free
+
 2007-04-04  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildonwm/hd-wm.c: Fixed some hdwm->keys cases left.

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-04-04 14:32:58 UTC (rev 10968)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-04-04 15:18:17 UTC (rev 10969)
@@ -38,7 +38,8 @@
 {
   PROP_LAYOUT_MODE = 1,
   PROP_SNAP_TO_GRID,
-  PROP_APPLET_PADDING
+  PROP_APPLET_PADDING,
+  PROP_DEFAULT_ALPHA
 
 };
 
@@ -799,15 +800,17 @@
 /*  g_list_free (priv->to_add);*/
 
 #else
-  GdkRectangle          area_rectangle = {0};
+  GdkRectangle         *area_rectangle;
   GList                *region = NULL, *i;
 
   priv = HILDON_HOME_AREA_GET_PRIVATE (area);
 
-  area_rectangle.width  = GTK_WIDGET (area)->allocation.width;
-  area_rectangle.height = GTK_WIDGET (area)->allocation.height;
+  area_rectangle = create_rectangle (0,
+                                     0,
+                                     GTK_WIDGET (area)->allocation.width,
+                                      GTK_WIDGET (area)->allocation.height);
 
-  region = g_list_append (region, &area_rectangle);
+  region = g_list_append (region, area_rectangle);
 
   gtk_container_foreach (GTK_CONTAINER (area),
                          (GtkCallback)remove_widget,
@@ -853,11 +856,11 @@
               gtk_container_add (GTK_CONTAINER (area), w);
               
               layout->width  = req.width;
-              if (layout->x + layout->width < area_rectangle.width)
+              if (layout->x + layout->width < area_rectangle->width)
                 layout->width += priv->applet_padding;
 
               layout->height = req.height;
-              if (layout->y + layout->height < area_rectangle.height)
+              if (layout->y + layout->height < area_rectangle->height)
                 layout->height += priv->applet_padding;
 
               if (layout->x)
@@ -889,7 +892,7 @@
           g_list_foreach (region, (GFunc)g_free, NULL);
           g_list_free (region);
           region = NULL;
-          region = g_list_append (region, &area_rectangle);
+          region = g_list_append (region, area_rectangle);
         }
       else
         i = g_list_next (i);