Fix type names for GtkIconSet, GtkIconSource, GtkSelectionData, GtkBorder,

Thu Jun 13 19:41:56 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkiconfactory.c gtk/gtkselection.c gtk/gtkstyle.c
        gtk/gtktextiter.c gtk/gtktexttag.c gtk/gtktreemodel.c
        gtk/gtkwidget.c: Fix type names for GtkIconSet,
        GtkIconSource, GtkSelectionData, GtkBorder, GtkTextIter,
        GtkTextAttributes, GtkTreePath, GtkTreeIter,
        GtkRequisition, which were all registered as GtkType*.
        (#84634, James Henstridge; patch from Jonathan Blandford.)

        * NEWS: Updates.

14 files changed, 107 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 5a19e6b5e..7c7876620 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Jun 13 19:41:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkiconfactory.c gtk/gtkselection.c gtk/gtkstyle.c
+	gtk/gtktextiter.c gtk/gtktexttag.c gtk/gtktreemodel.c
+	gtk/gtkwidget.c: Fix type names for GtkIconSet,
+	GtkIconSource, GtkSelectionData, GtkBorder, GtkTextIter,
+	GtkTextAttributes, GtkTreePath, GtkTreeIter, 
+	GtkRequisition, which were all registered as GtkType*.
+	(#84634, James Henstridge; patch from Jonathan Blandford.)
+
+	* NEWS: Updates.
+	
 Thu Jun 13 18:48:14 2002  Owen Taylor  <otaylor@redhat.com>
 
  	* gdk/x11/gdkcolor-x11.c: Make work
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5a19e6b5e..7c7876620 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Thu Jun 13 19:41:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkiconfactory.c gtk/gtkselection.c gtk/gtkstyle.c
+	gtk/gtktextiter.c gtk/gtktexttag.c gtk/gtktreemodel.c
+	gtk/gtkwidget.c: Fix type names for GtkIconSet,
+	GtkIconSource, GtkSelectionData, GtkBorder, GtkTextIter,
+	GtkTextAttributes, GtkTreePath, GtkTreeIter, 
+	GtkRequisition, which were all registered as GtkType*.
+	(#84634, James Henstridge; patch from Jonathan Blandford.)
+
+	* NEWS: Updates.
+	
 Thu Jun 13 18:48:14 2002  Owen Taylor  <otaylor@redhat.com>
 
  	* gdk/x11/gdkcolor-x11.c: Make work
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5a19e6b5e..7c7876620 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+Thu Jun 13 19:41:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkiconfactory.c gtk/gtkselection.c gtk/gtkstyle.c
+	gtk/gtktextiter.c gtk/gtktexttag.c gtk/gtktreemodel.c
+	gtk/gtkwidget.c: Fix type names for GtkIconSet,
+	GtkIconSource, GtkSelectionData, GtkBorder, GtkTextIter,
+	GtkTextAttributes, GtkTreePath, GtkTreeIter, 
+	GtkRequisition, which were all registered as GtkType*.
+	(#84634, James Henstridge; patch from Jonathan Blandford.)
+
+	* NEWS: Updates.
+	
 Thu Jun 13 18:48:14 2002  Owen Taylor  <otaylor@redhat.com>
 
  	* gdk/x11/gdkcolor-x11.c: Make work
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5a19e6b5e..7c7876620 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Thu Jun 13 19:41:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkiconfactory.c gtk/gtkselection.c gtk/gtkstyle.c
+	gtk/gtktextiter.c gtk/gtktexttag.c gtk/gtktreemodel.c
+	gtk/gtkwidget.c: Fix type names for GtkIconSet,
+	GtkIconSource, GtkSelectionData, GtkBorder, GtkTextIter,
+	GtkTextAttributes, GtkTreePath, GtkTreeIter, 
+	GtkRequisition, which were all registered as GtkType*.
+	(#84634, James Henstridge; patch from Jonathan Blandford.)
+
+	* NEWS: Updates.
+	
 Thu Jun 13 18:48:14 2002  Owen Taylor  <otaylor@redhat.com>
 
  	* gdk/x11/gdkcolor-x11.c: Make work
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5a19e6b5e..7c7876620 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Thu Jun 13 19:41:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkiconfactory.c gtk/gtkselection.c gtk/gtkstyle.c
+	gtk/gtktextiter.c gtk/gtktexttag.c gtk/gtktreemodel.c
+	gtk/gtkwidget.c: Fix type names for GtkIconSet,
+	GtkIconSource, GtkSelectionData, GtkBorder, GtkTextIter,
+	GtkTextAttributes, GtkTreePath, GtkTreeIter, 
+	GtkRequisition, which were all registered as GtkType*.
+	(#84634, James Henstridge; patch from Jonathan Blandford.)
+
+	* NEWS: Updates.
+	
 Thu Jun 13 18:48:14 2002  Owen Taylor  <otaylor@redhat.com>
 
  	* gdk/x11/gdkcolor-x11.c: Make work
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5a19e6b5e..7c7876620 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Thu Jun 13 19:41:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkiconfactory.c gtk/gtkselection.c gtk/gtkstyle.c
+	gtk/gtktextiter.c gtk/gtktexttag.c gtk/gtktreemodel.c
+	gtk/gtkwidget.c: Fix type names for GtkIconSet,
+	GtkIconSource, GtkSelectionData, GtkBorder, GtkTextIter,
+	GtkTextAttributes, GtkTreePath, GtkTreeIter, 
+	GtkRequisition, which were all registered as GtkType*.
+	(#84634, James Henstridge; patch from Jonathan Blandford.)
+
+	* NEWS: Updates.
+	
 Thu Jun 13 18:48:14 2002  Owen Taylor  <otaylor@redhat.com>
 
  	* gdk/x11/gdkcolor-x11.c: Make work
diff --git a/NEWS b/NEWS
index dc1dcc070..006ebf9c0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,29 @@
+Overview of Changes in GTK+ 2.0.4
+=================================
+
+* Fix a number of types which were registered with the 
+  type system with the wrong names [James Henstridge, Jonathan Blandford]
+* Support missing data types in GtkList/TreeStore [Daniel Elstner]
+* Misc GtkTreeView bug fixes [Dave Camp, Jonathan, Daniel Elstner, 
+  Josh Parsons]
+* Drag and drop fixes, including a stuck grab. [Dave, Thomas Leonard, 
+  Owen Taylor]
+* Calculate screen size on win32 from the "logical DPI" 
+  [Joaquin Cuenca Abela, Tor Lillqvist]
+* Misc Win32 bug fixes. [Florent Duguet, Torn]
+* Fix theme changes for GtkMenu [Soeren Sandmann]
+* Fix gdk_pixbuf_from_drawable() for big endian. [Federico Mena Quintero]
+* Fix encoding handling for gtk_file_selection_set_filename()
+  [Sebastian Ritau, Owen]
+* Fix crash with DND, Qt and Metacity [Cha Young-Ho, Havoc, Owen]
+* Fixes for DirectColor visuals [Shivaram Upadhyayula]
+* Memory leak and UMR fixes [Michael Meeks, Matthias Clasen, Valgrind]
+* Misc bug fixes
+
+Other contributors: Jacob Berkman, Remus Draica, Nano Golveia, 
+  Tim Janik, Sergey Kuzminov, George Lebl, Garrett Lesage, 
+  Timo Meinen, Michel Selten, Boris Shingarov, Jeff Waugh
+
 Overview of Changes in GTK+ 2.0.3
 =================================
 
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 209d5a6b5..1a42c3d79 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -1211,7 +1211,7 @@ gtk_icon_set_get_type (void)
   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 @@ gtk_icon_source_get_type (void)
   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);
 
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 1974fb1c7..632f152f5 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1825,7 +1825,7 @@ gtk_selection_data_get_type (void)
   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);
 
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 5ac1002d0..d2baac11c 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -5554,7 +5554,7 @@ gtk_border_get_type (void)
   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);
 
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 4d980b7c3..7f4e978ce 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -469,7 +469,7 @@ gtk_text_iter_get_type (void)
   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);
 
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index b6baa4b26..c1710f9c1 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -1871,7 +1871,7 @@ gtk_text_attributes_get_type (void)
   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);
 
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index ef894fcc9..ce077b9ac 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -373,7 +373,7 @@ gtk_tree_path_get_type (void)
   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 @@ gtk_tree_iter_get_type (void)
   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);
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 3fc63649c..86917c7fb 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6401,7 +6401,7 @@ gtk_requisition_get_type (void)
   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);