bumped version number to Gtk+ 1.2.2, interface 0, binary 2.

Sun Apr 11 15:08:27 1999  Tim Janik  <timj@gtk.org>

        * configure.in: bumped version number to Gtk+ 1.2.2, interface 0,
        binary 2.

        * NEWS: updates.

Sun Apr 11 14:38:03 1999  Tim Janik  <timj@gtk.org>

        * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color
        "None" case insensitive.

11 files changed, 110 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 32fe68b04..01fcdc15f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sun Apr 11 15:08:27 1999  Tim Janik  <timj@gtk.org>
+
+	* configure.in: bumped version number to Gtk+ 1.2.2, interface 0,
+	binary 2.
+	
+	* NEWS: updates.
+
+Sun Apr 11 14:38:03 1999  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color
+	"None" case insensitive.
+
 Fri Apr  9 19:22:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c gtk/gtkdnd.c gtk/gtkmenuitem.c:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 32fe68b04..01fcdc15f 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+Sun Apr 11 15:08:27 1999  Tim Janik  <timj@gtk.org>
+
+	* configure.in: bumped version number to Gtk+ 1.2.2, interface 0,
+	binary 2.
+	
+	* NEWS: updates.
+
+Sun Apr 11 14:38:03 1999  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color
+	"None" case insensitive.
+
 Fri Apr  9 19:22:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c gtk/gtkdnd.c gtk/gtkmenuitem.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 32fe68b04..01fcdc15f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Sun Apr 11 15:08:27 1999  Tim Janik  <timj@gtk.org>
+
+	* configure.in: bumped version number to Gtk+ 1.2.2, interface 0,
+	binary 2.
+	
+	* NEWS: updates.
+
+Sun Apr 11 14:38:03 1999  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color
+	"None" case insensitive.
+
 Fri Apr  9 19:22:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c gtk/gtkdnd.c gtk/gtkmenuitem.c:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 32fe68b04..01fcdc15f 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+Sun Apr 11 15:08:27 1999  Tim Janik  <timj@gtk.org>
+
+	* configure.in: bumped version number to Gtk+ 1.2.2, interface 0,
+	binary 2.
+	
+	* NEWS: updates.
+
+Sun Apr 11 14:38:03 1999  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color
+	"None" case insensitive.
+
 Fri Apr  9 19:22:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c gtk/gtkdnd.c gtk/gtkmenuitem.c:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 32fe68b04..01fcdc15f 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Sun Apr 11 15:08:27 1999  Tim Janik  <timj@gtk.org>
+
+	* configure.in: bumped version number to Gtk+ 1.2.2, interface 0,
+	binary 2.
+	
+	* NEWS: updates.
+
+Sun Apr 11 14:38:03 1999  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color
+	"None" case insensitive.
+
 Fri Apr  9 19:22:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c gtk/gtkdnd.c gtk/gtkmenuitem.c:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 32fe68b04..01fcdc15f 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Sun Apr 11 15:08:27 1999  Tim Janik  <timj@gtk.org>
+
+	* configure.in: bumped version number to Gtk+ 1.2.2, interface 0,
+	binary 2.
+	
+	* NEWS: updates.
+
+Sun Apr 11 14:38:03 1999  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color
+	"None" case insensitive.
+
 Fri Apr  9 19:22:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c gtk/gtkdnd.c gtk/gtkmenuitem.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 32fe68b04..01fcdc15f 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Sun Apr 11 15:08:27 1999  Tim Janik  <timj@gtk.org>
+
+	* configure.in: bumped version number to Gtk+ 1.2.2, interface 0,
+	binary 2.
+	
+	* NEWS: updates.
+
+Sun Apr 11 14:38:03 1999  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color
+	"None" case insensitive.
+
 Fri Apr  9 19:22:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c gtk/gtkdnd.c gtk/gtkmenuitem.c:
diff --git a/NEWS b/NEWS
index 618392153..3da57f7a0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+Overview of Changes in GTK+ 1.2.2:
+
+* Improved Dnd behaviour with Motif applications.
+* Bug fixes for the Gtk selection code.
+* Minor bug fixes to the Gdk Atom cache and Dnd code (with --display option).
+* Bug fixes and leak plugs for the Gdk IM code.
+* Added gtk_object_get() facility to retrive object arguments easily.
+  The var args list expects ("arg-name", &value) pairs.
+* Fixed mapping for GdkInputCondition<->GIOCondition, this should fix
+  problems where closed pipes were no longer signalling GDK_INPUT_READ on
+  systems with a native poll().
+* Some cleanups to GtkLabel's memory allocation code (shouldn't leak memory
+  anymore).
+* We don't attempt to lookup xpm color "None" anymore, this should prevent
+  eXodus (commercial X windows server) from popping up a color dialog every
+  time a transparent pixmap is created.
+* Fixed bug where Gtk timout/idle handlers would execute without the global
+  Gdk lock being held.
+* Other minor bug fixes.
+
 Overview of Changes in GTK+ 1.2.1:
 
 * Many Bug fixes have been applied to the menu and accelerator code.
diff --git a/configure.in b/configure.in
index 5f20d6202..7e6c975d5 100644
--- a/configure.in
+++ b/configure.in
@@ -29,9 +29,9 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=2
-GTK_MICRO_VERSION=1
+GTK_MICRO_VERSION=2
 GTK_INTERFACE_AGE=0
-GTK_BINARY_AGE=1
+GTK_BINARY_AGE=2
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
 dnl
 AC_DIVERT_POP()dnl
@@ -217,9 +217,9 @@ fi
 if test x$with_glib = x ; then 
   # Look for separately installed glib
 
-  AM_PATH_GLIB(1.2.1,,
+  AM_PATH_GLIB(1.2.2,,
     AC_MSG_ERROR([
-*** GLIB 1.2.1 or better is required. The latest version of GLIB
+*** GLIB 1.2.2 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org/.]),
     gmodule gthread)
 
diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c
index c3d663cf9..4fa6adb70 100644
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.c
@@ -518,7 +518,7 @@ _gdk_pixmap_create_from_xpm (GdkWindow  *window,
       
       color_name = gdk_pixmap_extract_color (buffer);
       
-      if (color_name == NULL || strcmp (color_name, "None") == 0 ||
+      if (color_name == NULL || g_strcasecmp (color_name, "None") == 0 ||
 	  gdk_color_parse (color_name, &color->color) == FALSE)
 	{
 	  color->color = *transparent_color;
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index c3d663cf9..4fa6adb70 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -518,7 +518,7 @@ _gdk_pixmap_create_from_xpm (GdkWindow  *window,
       
       color_name = gdk_pixmap_extract_color (buffer);
       
-      if (color_name == NULL || strcmp (color_name, "None") == 0 ||
+      if (color_name == NULL || g_strcasecmp (color_name, "None") == 0 ||
 	  gdk_color_parse (color_name, &color->color) == FALSE)
 	{
 	  color->color = *transparent_color;