[maemo-commits] [maemo-commits] r11726 - in projects/haf/trunk/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-05-21 13:54:20 +0300 (Mon, 21 May 2007)
New Revision: 11726

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/hildon-color-chooser-dialog.c
   projects/haf/trunk/hildon-1/src/hildon-color-chooser.c
Log:
A few more GdkColor struct allocation fixes straight from Tommi labs.


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2007-05-21 09:45:26 UTC (rev 11725)
+++ projects/haf/trunk/hildon-1/ChangeLog	2007-05-21 10:54:20 UTC (rev 11726)
@@ -1,5 +1,11 @@
 2007-05-21  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
+	* src/hildon-color-chooser-dialog.c:
+	* src/hildon-color-chooser.c: A few more GdkColor struct allocation fixes
+	straight from Tommi labs.
+
+2007-05-21  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
 	* examples/hildon-finger-example.c: Correcting the header file path.
 
 	* src/hildon-color-chooser-dialog.c: Allocate the color on the stack for 

Modified: projects/haf/trunk/hildon-1/src/hildon-color-chooser-dialog.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-color-chooser-dialog.c	2007-05-21 09:45:26 UTC (rev 11725)
+++ projects/haf/trunk/hildon-1/src/hildon-color-chooser-dialog.c	2007-05-21 10:54:20 UTC (rev 11726)
@@ -516,6 +516,7 @@
 
     if (tmpcolor) {
         priv->style_info.default_color = *tmpcolor;
+	gdk_color_free (tmpcolor);
     } else {
         priv->style_info.default_color.red   = 0x0000;
         priv->style_info.default_color.green = 0x0000;
@@ -593,6 +594,7 @@
 
         if (tmpcolor) {
             priv->colors_defined[i] = *tmpcolor;
+	    gdk_color_free (tmpcolor);
         } else {
             if(i < 16) {
                 priv->colors_defined[i] = hardcoded_colors[i];

Modified: projects/haf/trunk/hildon-1/src/hildon-color-chooser.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-color-chooser.c	2007-05-21 09:45:26 UTC (rev 11725)
+++ projects/haf/trunk/hildon-1/src/hildon-color-chooser.c	2007-05-21 10:54:20 UTC (rev 11726)
@@ -1321,9 +1321,9 @@
     {
 
         case PROP_COLOR: {
-            GdkColor *color = g_new (GdkColor, 1);
-            hildon_color_chooser_get_color ((HildonColorChooser *) object, color);
-            g_value_take_boxed (value, color);
+            GdkColor color;
+            hildon_color_chooser_get_color ((HildonColorChooser *) object, &color);
+            g_value_set_boxed (value, &color);
             } break;
 
         default: