gtk+ r20836 - in trunk: . gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Jul 15 15:23:43 2008
New Revision: 20836
URL: http://svn.gnome.org/viewvc/gtk+?rev=20836&view=rev

Log:
2008-07-15  Xavier Claessens  <xclaesse gmail com>

	Bug 542523 - GtkTextTag should handle setting properties to NULL

	* gtk/gtktexttag.c (gtk_text_tag_set_property): Unset the color when
	setting it to NULL instead of displaying a warning.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtktexttag.c

Modified: trunk/gtk/gtktexttag.c
==============================================================================
--- trunk/gtk/gtktexttag.c	(original)
+++ trunk/gtk/gtktexttag.c	Tue Jul 15 15:23:43 2008
@@ -1002,7 +1002,9 @@
       {
         GdkColor color;
 
-        if (gdk_color_parse (g_value_get_string (value), &color))
+        if (!g_value_get_string (value))
+          set_bg_color (text_tag, NULL);       /* reset to background_set to FALSE */
+        else if (gdk_color_parse (g_value_get_string (value), &color))
           set_bg_color (text_tag, &color);
         else
           g_warning ("Don't know color `%s'", g_value_get_string (value));
@@ -1015,7 +1017,9 @@
       {
         GdkColor color;
 
-        if (gdk_color_parse (g_value_get_string (value), &color))
+        if (!g_value_get_string (value))
+          set_fg_color (text_tag, NULL);       /* reset to foreground_set to FALSE */
+        else if (gdk_color_parse (g_value_get_string (value), &color))
           set_fg_color (text_tag, &color);
         else
           g_warning ("Don't know color `%s'", g_value_get_string (value));
@@ -1295,7 +1299,9 @@
       {
         GdkColor color;
 
-        if (gdk_color_parse (g_value_get_string (value), &color))
+        if (!g_value_get_string (value))
+          set_pg_bg_color (text_tag, NULL);       /* reset to paragraph_background_set to FALSE */
+        else if (gdk_color_parse (g_value_get_string (value), &color))
           set_pg_bg_color (text_tag, &color);
         else
           g_warning ("Don't know color `%s'", g_value_get_string (value));