? glade-patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/glade2/ChangeLog,v
retrieving revision 1.14
diff -u -r1.14 ChangeLog
--- ChangeLog	2001/07/11 04:34:58	1.14
+++ ChangeLog	2001/07/13 15:05:01
@@ -1,3 +1,11 @@
+2001-07-13  Archit Baweja  <bighead@crosswinds.net>
+
+	* src/glade-widget-class.c (glade_widget_class_compose_get_type_func): 
+	changed to negate use of <GetTypeFunction> in the XML files.
+
+	* src/glade-widget-class.c (glade_widget_class_new_from_node): use
+	above function.
+	
 2001-07-10  Chema Celorio  <chema@celorio.com>
 
 	* src/glade-gtk.c (glade_gtk_entry_set_text): implement.
Index: src/glade-widget-class.c
===================================================================
RCS file: /cvs/gnome/glade2/src/glade-widget-class.c,v
retrieving revision 1.9
diff -u -r1.9 glade-widget-class.c
--- src/glade-widget-class.c	2001/07/11 04:34:59	1.9
+++ src/glade-widget-class.c	2001/07/13 15:05:17
@@ -45,7 +45,7 @@
 #include "glade-parameter.h"
 #include "glade-widget-class.h"
 
-#if 0 /* Keep arround */
+
 static gchar *
 glade_widget_class_compose_get_type_func (GladeWidgetClass *class)
 {
@@ -57,8 +57,11 @@
 
 	while (tmp->str[i]) {
 		if (isupper (tmp->str[i])) {
-			tmp = g_string_insert_c (tmp, i, '_');
-			i+=2;
+			tmp = g_string_insert_c (tmp, i++, '_');
+
+			while (isupper (tmp->str[i]))
+				i++;
+
 			continue;
 		}
 		i++;
@@ -70,8 +73,8 @@
 
 	return retval;
 }
-#endif
 
+
 static GladeWidgetClass *
 glade_widget_class_new (void)
 {
@@ -201,8 +204,9 @@
 
 	class->name         = glade_xml_get_value_string_required (node, GLADE_TAG_NAME, NULL);
 	class->generic_name = glade_xml_get_value_string_required (node, GLADE_TAG_GENERIC_NAME, NULL);
+
+	init_function_name = glade_widget_class_compose_get_type_func (class);
 
-	init_function_name = glade_xml_get_value_string_required (node, GLADE_TAG_GET_TYPE_FUNCTION, NULL);
 	if (!init_function_name)
 		return FALSE;
 	if (!glade_widget_class_set_type (class, init_function_name))