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

[tvb svn gnome org]

Author: tvb
Date: Fri May  2 02:37:35 2008
New Revision: 1810
URL: http://svn.gnome.org/viewvc/glade3?rev=1810&view=rev

Log:

	* gladeui/glade-utils.h, gladeui/glade-builtins.h: Removed unused prototypes

	* gladeui/glade-editor.c: Added safety check.

	* gladeui/glade-property.c: Dont load virtual properties.

	* gladeui/glade-property-class.c: Fixed bug where G_PARAM_SPEC_BOXED was
	  used to check if the value held a boxed type.



Modified:
   trunk/ChangeLog
   trunk/gladeui/glade-builtins.h
   trunk/gladeui/glade-editor.c
   trunk/gladeui/glade-property-class.c
   trunk/gladeui/glade-property.c
   trunk/gladeui/glade-utils.h
   trunk/plugins/gtk+/Makefile.am

Modified: trunk/gladeui/glade-builtins.h
==============================================================================
--- trunk/gladeui/glade-builtins.h	(original)
+++ trunk/gladeui/glade-builtins.h	Fri May  2 02:37:35 2008
@@ -35,10 +35,6 @@
 GType        glade_param_objects_get_type        (void) G_GNUC_CONST;
 GType        glade_item_appearance_get_type      (void) G_GNUC_CONST;
 
-guint        glade_builtin_key_from_string (const gchar   *string);
-const gchar *glade_builtin_string_from_key (guint          key);
-
-
 GParamSpec  *glade_param_spec_objects      (const gchar   *name,
 					    const gchar   *nick,
 					    const gchar   *blurb,

Modified: trunk/gladeui/glade-editor.c
==============================================================================
--- trunk/gladeui/glade-editor.c	(original)
+++ trunk/gladeui/glade-editor.c	Fri May  2 02:37:35 2008
@@ -511,9 +511,14 @@
 {
 	GladeEditorProperty *property;
 
-	property = glade_widget_adaptor_create_eprop 
-		(GLADE_WIDGET_ADAPTOR (klass->handle), 
-		 klass, from_query_dialog == FALSE);
+	if (!(property = glade_widget_adaptor_create_eprop 
+	      (GLADE_WIDGET_ADAPTOR (klass->handle), 
+	       klass, from_query_dialog == FALSE)))
+	{
+		g_critical ("Unable to create editor for property '%s' of class '%s'",
+			    klass->id, GLADE_WIDGET_ADAPTOR (klass->handle)->name);
+		return NULL;
+	}
 
 	gtk_widget_show (GTK_WIDGET (property));
 	gtk_widget_show_all (property->item_label);

Modified: trunk/gladeui/glade-property-class.c
==============================================================================
--- trunk/gladeui/glade-property-class.c	(original)
+++ trunk/gladeui/glade-property-class.c	Fri May  2 02:37:35 2008
@@ -1600,12 +1600,12 @@
 	g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (klass), -1);
 	
 	/* GLib does not know how to compare a boxed real value */
-	if (G_PARAM_SPEC_BOXED (klass->pspec))
+	if (G_VALUE_HOLDS_BOXED (value1))
 	{
 		gchar *val1, *val2;
 		
-		val1 = glade_property_class_make_string_from_gvalue (klass, value1),
-		val2 = glade_property_class_make_string_from_gvalue (klass, value2);
+		val1 = glade_widget_adaptor_string_from_value (klass->handle, klass, value1);
+		val2 = glade_widget_adaptor_string_from_value (klass->handle, klass, value2);
 
 		if (val1 && val2)
 			retval = strcmp (val1, val2);

Modified: trunk/gladeui/glade-property.c
==============================================================================
--- trunk/gladeui/glade-property.c	(original)
+++ trunk/gladeui/glade-property.c	Fri May  2 02:37:35 2008
@@ -380,6 +380,7 @@
 	GObjectClass *oclass;
 	
 	if (property->widget == NULL ||
+	    property->klass->virt    ||
 	    property->klass->packing ||
 	    property->klass->ignore  ||
 	    !(property->klass->pspec->flags & G_PARAM_READABLE))

Modified: trunk/gladeui/glade-utils.h
==============================================================================
--- trunk/gladeui/glade-utils.h	(original)
+++ trunk/gladeui/glade-utils.h	Fri May  2 02:37:35 2008
@@ -21,8 +21,6 @@
 	GLADE_UI_YES_OR_NO
 } GladeUIMessageType;
 
-void		glade_util_widget_set_tooltip	(GtkWidget *widget, const gchar *str);
-
 GType		glade_util_get_type_from_name	(const gchar *name, gboolean have_func);
 
 GParamSpec      *glade_utils_get_pspec_from_funcname (const gchar *funcname);

Modified: trunk/plugins/gtk+/Makefile.am
==============================================================================
--- trunk/plugins/gtk+/Makefile.am	(original)
+++ trunk/plugins/gtk+/Makefile.am	Fri May  2 02:37:35 2008
@@ -23,12 +23,12 @@
 	$(PLUGINS_WARN_CFLAGS)         \
 	$(AM_CFLAGS)
 
-libgladegtk_la_SOURCES     = glade-gtk.c glade-accels.c glade-keysyms.c fixed-bg.xpm
+libgladegtk_la_SOURCES     = glade-gtk.c glade-accels.c glade-attributes.c fixed-bg.xpm
 libgladegtk_la_LDFLAGS     = -module -avoid-version $(AM_LDFLAGS)
 libgladegtk_la_LIBADD      = $(libgladeui) $(GTK_LIBS)
 
 libgladegtkincludedir= $(includedir)/libgladeui-1.0/gladeui
-libgladegtkinclude_HEADERS = glade-gtk.h glade-accels.h
+libgladegtkinclude_HEADERS = glade-gtk.h glade-accels.h glade-attributes.h
 
 if PLATFORM_WIN32
 libgladegtk_la_LDFLAGS += -no-undefined