glade3 r1988 - in trunk: . plugins/gtk+

[jpu svn gnome org]

Author: jpu
Date: Wed Oct 22 22:56:20 2008
New Revision: 1988
URL: http://svn.gnome.org/viewvc/glade3?rev=1988&view=rev

Log:
* plugins/gtk+/glade-gtk.c: fixed bug in glade_gtk_assistant_verify_property()
  new value should be >= that current

* plugins/gtk+/gtk+.xml.in: renamed virtual property GtkAssistant::size to n-pages


Modified:
   trunk/ChangeLog
   trunk/plugins/gtk+/glade-gtk.c
   trunk/plugins/gtk+/gtk+.xml.in

Modified: trunk/plugins/gtk+/glade-gtk.c
==============================================================================
--- trunk/plugins/gtk+/glade-gtk.c	(original)
+++ trunk/plugins/gtk+/glade-gtk.c	Wed Oct 22 22:56:20 2008
@@ -8016,7 +8016,7 @@
 		
 		gtk_assistant_set_current_page (assistant, 0);
 		glade_widget_property_set (glade_widget_get_from_gobject (object),
-					   "size", pages);
+					   "n-pages", pages);
 	}
 }
 
@@ -8052,7 +8052,7 @@
 		
 		gtk_assistant_set_current_page (GTK_ASSISTANT (object), 0);
 		
-		glade_widget_property_set (parent, "size", 3);
+		glade_widget_property_set (parent, "n-pages", 3);
 	}
 }
 
@@ -8076,7 +8076,7 @@
 	GladeWidget *gassistant = glade_widget_get_from_gobject (container);
 	
 	gtk_container_remove (GTK_CONTAINER (container), GTK_WIDGET (child));
-	glade_widget_property_set (gassistant, "size",
+	glade_widget_property_set (gassistant, "n-pages",
 			   	   gtk_assistant_get_n_pages (assistant));
 }
 
@@ -8105,8 +8105,8 @@
 				     const gchar *property_name,
 				     const GValue *value)
 {
-	if (strcmp (property_name, "size") == 0)
-		return  g_value_get_int (value) >
+	if (strcmp (property_name, "n-pages") == 0)
+		return  g_value_get_int (value) >=
 			gtk_assistant_get_n_pages (GTK_ASSISTANT (object));
 	
 	/* Chain Up */
@@ -8124,7 +8124,7 @@
 				  const gchar *property_name,
 				  const GValue *value)
 {
-	if (strcmp (property_name, "size") == 0)
+	if (strcmp (property_name, "n-pages") == 0)
 	{
 		GtkAssistant *assistant = GTK_ASSISTANT (object);
 		gint size, i;
@@ -8151,7 +8151,7 @@
 				  const gchar *property_name,
 				  GValue *value)
 {
-	if (strcmp (property_name, "size") == 0)
+	if (strcmp (property_name, "n-pages") == 0)
 	{
 		g_value_set_int (value, 
 			gtk_assistant_get_n_pages (GTK_ASSISTANT (object)));

Modified: trunk/plugins/gtk+/gtk+.xml.in
==============================================================================
--- trunk/plugins/gtk+/gtk+.xml.in	(original)
+++ trunk/plugins/gtk+/gtk+.xml.in	Wed Oct 22 22:56:20 2008
@@ -1632,7 +1632,7 @@
       <child-set-property-function>glade_gtk_assistant_set_child_property</child-set-property-function>
       <child-get-property-function>glade_gtk_assistant_get_child_property</child-get-property-function>
       <properties>
-        <property save="False" id="size" _name="Size">
+        <property save="False" id="n-pages" _name="NÂ pages">
 	  <_tooltip>Number of pages</_tooltip>
 	  <spec>glade_standard_int_spec</spec>
 	</property>