type patch

[Jonathan Blandford <jrb redhat com>]

Hi,

Currently, a number of types are registered as "GtkTypeFoo" instead of
simply "GtkFoo".  This problem is explained in greater detail in bug
#84633.  I have attached a fix that fixes this.  It will probably break
code like glade and language bindings, so it probably only makes sense
to commit this to HEAD only.  Of course, these are obviously all wrong,
so it's tempting to bite the bullet and just try to fix it now.
Thoughts?

-Jonathan

? autom4te-2.53.cache
? demos/gtk-demo/geninclude.pl
Index: gtk/gtkiconfactory.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkiconfactory.c,v
retrieving revision 1.38
diff -u -r1.38 gtkiconfactory.c
--- gtk/gtkiconfactory.c	29 Mar 2002 23:00:41 -0000	1.38
+++ gtk/gtkiconfactory.c	11 Jun 2002 18:46:02 -0000
@@ -1211,7 +1211,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeIconSet",
+    our_type = g_boxed_type_register_static ("GtkIconSet",
 					     (GBoxedCopyFunc) gtk_icon_set_ref,
 					     (GBoxedFreeFunc) gtk_icon_set_unref);
 
@@ -1694,7 +1694,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeIconSource",
+    our_type = g_boxed_type_register_static ("GtkIconSource",
 					     (GBoxedCopyFunc) gtk_icon_source_copy,
 					     (GBoxedFreeFunc) gtk_icon_source_free);
 
Index: gtk/gtkselection.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkselection.c,v
retrieving revision 1.50
diff -u -r1.50 gtkselection.c
--- gtk/gtkselection.c	2 Mar 2002 19:11:38 -0000	1.50
+++ gtk/gtkselection.c	11 Jun 2002 18:46:02 -0000
@@ -1825,7 +1825,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeSelectionData",
+    our_type = g_boxed_type_register_static ("GtkSelectionData",
 					     (GBoxedCopyFunc) gtk_selection_data_copy,
 					     (GBoxedFreeFunc) gtk_selection_data_free);
 
Index: gtk/gtkstyle.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkstyle.c,v
retrieving revision 1.115
diff -u -r1.115 gtkstyle.c
--- gtk/gtkstyle.c	3 Mar 2002 19:59:27 -0000	1.115
+++ gtk/gtkstyle.c	11 Jun 2002 18:46:02 -0000
@@ -5554,7 +5554,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeBorder",
+    our_type = g_boxed_type_register_static ("GtkBorder",
 					     (GBoxedCopyFunc) gtk_border_copy,
 					     (GBoxedFreeFunc) gtk_border_free);
 
Index: gtk/gtktextiter.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktextiter.c,v
retrieving revision 1.69.2.1
diff -u -r1.69.2.1 gtktextiter.c
--- gtk/gtktextiter.c	24 Apr 2002 22:09:17 -0000	1.69.2.1
+++ gtk/gtktextiter.c	11 Jun 2002 18:46:02 -0000
@@ -469,7 +469,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeTextIter",
+    our_type = g_boxed_type_register_static ("GtkTextIter",
 					     (GBoxedCopyFunc) gtk_text_iter_copy,
 					     (GBoxedFreeFunc) gtk_text_iter_free);
 
Index: gtk/gtktexttag.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktexttag.c,v
retrieving revision 1.56
diff -u -r1.56 gtktexttag.c
--- gtk/gtktexttag.c	2 Mar 2002 19:11:41 -0000	1.56
+++ gtk/gtktexttag.c	11 Jun 2002 18:46:02 -0000
@@ -1871,7 +1871,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeTextAttributes",
+    our_type = g_boxed_type_register_static ("GtkTextAttributes",
 					     (GBoxedCopyFunc) gtk_text_attributes_ref,
 					     (GBoxedFreeFunc) gtk_text_attributes_unref);
 
Index: gtk/gtktreemodel.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktreemodel.c,v
retrieving revision 1.84.2.2
diff -u -r1.84.2.2 gtktreemodel.c
--- gtk/gtktreemodel.c	10 May 2002 21:48:20 -0000	1.84.2.2
+++ gtk/gtktreemodel.c	11 Jun 2002 18:46:02 -0000
@@ -373,7 +373,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeTreePath",
+    our_type = g_boxed_type_register_static ("GtkTreePath",
 					     (GBoxedCopyFunc) gtk_tree_path_copy,
 					     (GBoxedFreeFunc) gtk_tree_path_free);
 
@@ -597,7 +597,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeTreeIter",
+    our_type = g_boxed_type_register_static ("GtkTreeIter",
 					     (GBoxedCopyFunc) gtk_tree_iter_copy,
 					     (GBoxedFreeFunc) gtk_tree_iter_free);
 
Index: gtk/gtkwidget.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkwidget.c,v
retrieving revision 1.311.2.1
diff -u -r1.311.2.1 gtkwidget.c
--- gtk/gtkwidget.c	2 May 2002 19:09:34 -0000	1.311.2.1
+++ gtk/gtkwidget.c	11 Jun 2002 18:46:03 -0000
@@ -6401,7 +6401,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeRequisition",
+    our_type = g_boxed_type_register_static ("GtkRequisition",
 					     (GBoxedCopyFunc) gtk_requisition_copy,
 					     (GBoxedFreeFunc) gtk_requisition_free);