glade3 r2151 - in trunk: . gladeui plugins/gtk+

[jpu svn gnome org]

Author: jpu
Date: Mon Mar  9 18:50:25 2009
New Revision: 2151
URL: http://svn.gnome.org/viewvc/glade3?rev=2151&view=rev

Log:
* gladeui/glade-property.c: reverted fix for bug #573513. (bug #574260)

* plugins/gtk+/glade-gtk.c: fixed bug #573513 again.


Modified:
   trunk/ChangeLog
   trunk/gladeui/glade-property.c
   trunk/plugins/gtk+/glade-gtk.c

Modified: trunk/gladeui/glade-property.c
==============================================================================
--- trunk/gladeui/glade-property.c	(original)
+++ trunk/gladeui/glade-property.c	Mon Mar  9 18:50:25 2009
@@ -1128,9 +1128,6 @@
 	if (!(property->klass->save_always || property->save_always) &&
 	    glade_property_original_default (property))
 		return;
-	
-	/* Also skip disabled properties */
-	if (property->klass->save == FALSE) return;
 
 	/* Escape our string and save with underscores */
 	name = g_strdup (property->klass->id);

Modified: trunk/plugins/gtk+/glade-gtk.c
==============================================================================
--- trunk/plugins/gtk+/glade-gtk.c	(original)
+++ trunk/plugins/gtk+/glade-gtk.c	Mon Mar  9 18:50:25 2009
@@ -5880,18 +5880,21 @@
 	    (node, GLADE_XML_TAG_WIDGET (glade_project_get_format (widget->project))))
 		return;
 
-	prop = glade_widget_get_property (widget, "label");
-
-	/* Make a copy of the GladeProperty, override its value if use-stock is TRUE */
-	prop = glade_property_dup (prop, widget);
-	glade_widget_property_get (widget, "use-stock", &use_stock);
-	if (use_stock)
+	/* Do not save GtkColorButton and GtkFontButton label property */
+	if (!(GTK_IS_COLOR_BUTTON (widget->object) || GTK_IS_FONT_BUTTON (widget->object)))
 	{
-		glade_widget_property_get (widget, "stock", &stock);
-		glade_property_set (prop, stock);
+		prop = glade_widget_get_property (widget, "label");
+		/* Make a copy of the GladeProperty, override its value if use-stock is TRUE */
+		prop = glade_property_dup (prop, widget);
+		glade_widget_property_get (widget, "use-stock", &use_stock);
+		if (use_stock)
+		{
+			glade_widget_property_get (widget, "stock", &stock);
+			glade_property_set (prop, stock);
+		}
+		glade_property_write (prop, context, node);
+		g_object_unref (G_OBJECT (prop));
 	}
-	glade_property_write (prop, context, node);
-	g_object_unref (G_OBJECT (prop));
 
 	prop = glade_widget_get_property (widget, "response-id");
 	if (glade_property_get_enabled (prop) &&