2006-09-19 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>

* hildon-widgets-plugins/hildon-color-chooser-dialog-hsv.c:
	Replacing a custom hex -> color with a stock gdk func.

	* hildon-widgets/hildon-caption.c:
	Ups... a momentary lapse of reason.

diff --git a/ChangeLog b/ChangeLog
index d8d3ac7..56c5272 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-09-19  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
+       * hildon-widgets-plugins/hildon-color-chooser-dialog-hsv.c:
+       Replacing a custom hex -> color with a stock gdk func. 
+
+       * hildon-widgets/hildon-caption.c:
+       Ups... a momentary lapse of reason.
+
+2006-09-19  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
        * hildon-widgets/hildon-time-editor.c:
        (validated_conversion): Added default parameter -- if the field is
        empty, sets this value.

diff --git a/hildon-widgets-plugins/hildon-color-chooser-dialog-hsv.c b/hildon-widgets-plugins/hildon-color-chooser-dialog-hsv.c
index 9662e06..ab8c4f1 100644 (file)
--- a/hildon-widgets-plugins/hildon-color-chooser-dialog-hsv.c
+++ b/hildon-widgets-plugins/hildon-color-chooser-dialog-hsv.c
@@ -1007,23 +1007,16 @@ static void hildon_color_chooser_dialog_hsv_set_color_num(HildonColorChooserDial
 
 static void hildon_color_chooser_dialog_hsv_ascii_hex_to_color(gchar *s, GdkColor *color)
 {
-  int vals[12], i;
+  g_return_if_fail (s != NULL, NULL);
+  g_return_if_fail (color != NULL, NULL);
 
-
-  for(i = 0; i < 12; i++) {
-    if(s[i] >= '0' && s[i] <= '9') {
-      vals[i] = s[i] - 0x30;
-    } else if(s[i] >= 'a' && s[i] <= 'f') {
-      vals[i] = s[i] - 0x57;
-    } else {
-      vals[i] = 0;
-    }
+  if (s[0] != '#') {
+    gchar *s_copy = g_strdup_printf ("#%s", s);
+    gdk_color_parse (s_copy, color);
+    g_free (s_copy);
+  } else {
+    gdk_color_parse (s, color);
   }
-
-
-  color->red   = (vals[0] << 12) | (vals[1] <<  8) | (vals[2 ] <<  4) | (vals[3 ]      );
-  color->green = (vals[4] << 12) | (vals[5] <<  8) | (vals[6 ] <<  4) | (vals[7 ]      );
-  color->blue  = (vals[8] << 12) | (vals[9] <<  8) | (vals[10] <<  4) | (vals[11]      );
 }
 
 static void hildon_color_chooser_dialog_hsv_color_to_ascii_hex(gchar *s, GdkColor *color)

diff --git a/hildon-widgets/hildon-caption.c b/hildon-widgets/hildon-caption.c
index d23ba65..5878e06 100644 (file)
--- a/hildon-widgets/hildon-caption.c
+++ b/hildon-widgets/hildon-caption.c
@@ -384,7 +384,7 @@ static void hildon_caption_set_property( GObject *object, guint param_id,
       }
 
       /* Update label */
-      priv->text = g_value_get_string(value);
+      priv->text = g_value_dup_string(value);
       hildon_caption_set_label_text( priv );
       break;
       
@@ -428,7 +428,7 @@ static void hildon_caption_set_property( GObject *object, guint param_id,
         priv->separator = NULL;
       }
 
-      priv->separator = g_value_get_string(value);
+      priv->separator = g_value_dup_string(value);
       hildon_caption_set_label_text( priv );
       break;