glade3 r1855 - in trunk: . gladeui

[tvb svn gnome org]

Author: tvb
Date: Wed Aug  6 23:39:52 2008
New Revision: 1855
URL: http://svn.gnome.org/viewvc/glade3?rev=1855&view=rev

Log:

	* gladeui/glade-editor-property.c: Now objects and resource property fields are updated
	  correctly (bug 542335 - fix by Pavel Kostyuchenko).



Modified:
   trunk/ChangeLog
   trunk/gladeui/glade-editor-property.c
   trunk/gladeui/glade-editor-property.h

Modified: trunk/gladeui/glade-editor-property.c
==============================================================================
--- trunk/gladeui/glade-editor-property.c	(original)
+++ trunk/gladeui/glade-editor-property.c	Wed Aug  6 23:39:52 2008
@@ -93,8 +93,6 @@
 {
 	g_return_if_fail (GLADE_IS_EDITOR_PROPERTY (eprop));
 
-	g_signal_handler_block (G_OBJECT (eprop->property), eprop->changed_id);
-
 	if (eprop->use_command == FALSE)
 		glade_property_set_value (eprop->property, value);
 	else
@@ -107,6 +105,15 @@
 					  eprop->property->value, value) != 0)
 		GLADE_EDITOR_PROPERTY_GET_CLASS (eprop)->load (eprop, eprop->property);
 
+}
+
+void glade_editor_property_commit_no_callback (GladeEditorProperty *eprop,
+					       GValue              *value)
+{
+	g_return_if_fail (GLADE_IS_EDITOR_PROPERTY (eprop));
+
+	g_signal_handler_block (G_OBJECT (eprop->property), eprop->changed_id);
+	glade_editor_property_commit (eprop, value);
 	g_signal_handler_unblock (G_OBJECT (eprop->property), eprop->changed_id);
 }
 
@@ -734,7 +741,7 @@
 		g_warning ("Unsupported type %s\n",
 			   g_type_name(G_PARAM_SPEC_TYPE (eprop->klass->pspec)));
 
-	glade_editor_property_commit (eprop, &val);
+	glade_editor_property_commit_no_callback (eprop, &val);
 	g_value_unset (&val);
 }
 
@@ -825,7 +832,7 @@
 	g_value_init (&val, eprop->klass->pspec->value_type);
 	g_value_set_enum (&val, ival);
 
-	glade_editor_property_commit (eprop, &val);
+	glade_editor_property_commit_no_callback (eprop, &val);
 	g_value_unset (&val);
 }
 
@@ -1059,7 +1066,7 @@
 		g_value_init (&val, G_VALUE_TYPE (eprop->property->value));
 		g_value_set_flags (&val, new_value);
 
-		glade_editor_property_commit (eprop, &val);
+		glade_editor_property_commit_no_callback (eprop, &val);
 		g_value_unset (&val);
 	}
 
@@ -1278,7 +1285,7 @@
 	g_value_init (&value, GDK_TYPE_COLOR);
 	g_value_set_boxed (&value, &color);
 
-	glade_editor_property_commit (eprop, &value);
+	glade_editor_property_commit_no_callback (eprop, &value);
 	g_value_unset (&value);
 }
 
@@ -1619,7 +1626,7 @@
 			g_value_set_string (val, text);
 	}
 
-	glade_editor_property_commit (eprop, val);
+	glade_editor_property_commit_no_callback (eprop, val);
 	g_value_unset (val);
 	g_free (val);
 }
@@ -1955,7 +1962,7 @@
 	g_value_init (&val, G_TYPE_BOOLEAN);
 	g_value_set_boolean (&val, state);
 
-	glade_editor_property_commit (eprop, &val);
+	glade_editor_property_commit_no_callback (eprop, &val);
 
 	g_value_unset (&val);
 }
@@ -2037,7 +2044,7 @@
 		g_value_init (&val, G_TYPE_UINT);
 		g_value_set_uint (&val, unich);
 
-		glade_editor_property_commit (eprop, &val);
+		glade_editor_property_commit_no_callback (eprop, &val);
 
 		g_value_unset (&val);
 	}
@@ -3094,7 +3101,7 @@
 	g_value_init (&value, GTK_TYPE_ADJUSTMENT);
 	g_value_set_object (&value, G_OBJECT (adjustment));
 
-	glade_editor_property_commit (eprop, &value);
+	glade_editor_property_commit_no_callback (eprop, &value);
 
 	g_value_unset (&value);
 }

Modified: trunk/gladeui/glade-editor-property.h
==============================================================================
--- trunk/gladeui/glade-editor-property.h	(original)
+++ trunk/gladeui/glade-editor-property.h	Wed Aug  6 23:39:52 2008
@@ -154,6 +154,9 @@
 void                 glade_editor_property_commit         (GladeEditorProperty *eprop,
 							   GValue              *value);
 
+void                 glade_editor_property_commit_no_callback (GladeEditorProperty *eprop,
+							       GValue              *value);
+
 
 /* Generic eprops */
 #define GLADE_TYPE_EPROP_NUMERIC         (glade_eprop_numeric_get_type())