Remove useless and slightly confusing test. [ XInternAtom (,,TRUE) will

Thu Sep  2 19:02:37 1999  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkproperty.c (gdk_atom_intern): Remove useless
	  and slightly confusing test. [ XInternAtom (,,TRUE)
	  will never return None ].

	* gtk/testgtk.c (main): Add a check to see if we
	  are being run from the correct directory and
	  to quit nicely if we are not.

	* gtk/gtkrc.c (gtk_rc_slist_remove_all): Make function
	  static.

	* configure.in (REBUILD): Change check for perl5
	  to check explicitely for v >= 5.002. (5.001
	  does not work with our scripts.)

15 files changed, 151 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 28ff94d76..438c5239d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Thu Sep  2 19:02:37 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkproperty.c (gdk_atom_intern): Remove useless
+	  and slightly confusing test. [ XInternAtom (,,TRUE)
+	  will never return None ].
+
+	* gtk/testgtk.c (main): Add a check to see if we
+	  are being run from the correct directory and
+	  to quit nicely if we are not.
+
+	* gtk/gtkrc.c (gtk_rc_slist_remove_all): Make function
+	  static.
+
+	* configure.in (REBUILD): Change check for perl5
+	  to check explicitely for v >= 5.002. (5.001
+	  does not work with our scripts.)
+
 Thu Sep  2 23:00:03 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkenums.h (GtkWindowPosition): added GTK_WIN_POS_CENTER_ALWAYS.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 28ff94d76..438c5239d 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,20 @@
+Thu Sep  2 19:02:37 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkproperty.c (gdk_atom_intern): Remove useless
+	  and slightly confusing test. [ XInternAtom (,,TRUE)
+	  will never return None ].
+
+	* gtk/testgtk.c (main): Add a check to see if we
+	  are being run from the correct directory and
+	  to quit nicely if we are not.
+
+	* gtk/gtkrc.c (gtk_rc_slist_remove_all): Make function
+	  static.
+
+	* configure.in (REBUILD): Change check for perl5
+	  to check explicitely for v >= 5.002. (5.001
+	  does not work with our scripts.)
+
 Thu Sep  2 23:00:03 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkenums.h (GtkWindowPosition): added GTK_WIN_POS_CENTER_ALWAYS.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 28ff94d76..438c5239d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+Thu Sep  2 19:02:37 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkproperty.c (gdk_atom_intern): Remove useless
+	  and slightly confusing test. [ XInternAtom (,,TRUE)
+	  will never return None ].
+
+	* gtk/testgtk.c (main): Add a check to see if we
+	  are being run from the correct directory and
+	  to quit nicely if we are not.
+
+	* gtk/gtkrc.c (gtk_rc_slist_remove_all): Make function
+	  static.
+
+	* configure.in (REBUILD): Change check for perl5
+	  to check explicitely for v >= 5.002. (5.001
+	  does not work with our scripts.)
+
 Thu Sep  2 23:00:03 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkenums.h (GtkWindowPosition): added GTK_WIN_POS_CENTER_ALWAYS.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 28ff94d76..438c5239d 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,20 @@
+Thu Sep  2 19:02:37 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkproperty.c (gdk_atom_intern): Remove useless
+	  and slightly confusing test. [ XInternAtom (,,TRUE)
+	  will never return None ].
+
+	* gtk/testgtk.c (main): Add a check to see if we
+	  are being run from the correct directory and
+	  to quit nicely if we are not.
+
+	* gtk/gtkrc.c (gtk_rc_slist_remove_all): Make function
+	  static.
+
+	* configure.in (REBUILD): Change check for perl5
+	  to check explicitely for v >= 5.002. (5.001
+	  does not work with our scripts.)
+
 Thu Sep  2 23:00:03 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkenums.h (GtkWindowPosition): added GTK_WIN_POS_CENTER_ALWAYS.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 28ff94d76..438c5239d 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,20 @@
+Thu Sep  2 19:02:37 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkproperty.c (gdk_atom_intern): Remove useless
+	  and slightly confusing test. [ XInternAtom (,,TRUE)
+	  will never return None ].
+
+	* gtk/testgtk.c (main): Add a check to see if we
+	  are being run from the correct directory and
+	  to quit nicely if we are not.
+
+	* gtk/gtkrc.c (gtk_rc_slist_remove_all): Make function
+	  static.
+
+	* configure.in (REBUILD): Change check for perl5
+	  to check explicitely for v >= 5.002. (5.001
+	  does not work with our scripts.)
+
 Thu Sep  2 23:00:03 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkenums.h (GtkWindowPosition): added GTK_WIN_POS_CENTER_ALWAYS.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 28ff94d76..438c5239d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,20 @@
+Thu Sep  2 19:02:37 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkproperty.c (gdk_atom_intern): Remove useless
+	  and slightly confusing test. [ XInternAtom (,,TRUE)
+	  will never return None ].
+
+	* gtk/testgtk.c (main): Add a check to see if we
+	  are being run from the correct directory and
+	  to quit nicely if we are not.
+
+	* gtk/gtkrc.c (gtk_rc_slist_remove_all): Make function
+	  static.
+
+	* configure.in (REBUILD): Change check for perl5
+	  to check explicitely for v >= 5.002. (5.001
+	  does not work with our scripts.)
+
 Thu Sep  2 23:00:03 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkenums.h (GtkWindowPosition): added GTK_WIN_POS_CENTER_ALWAYS.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 28ff94d76..438c5239d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+Thu Sep  2 19:02:37 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkproperty.c (gdk_atom_intern): Remove useless
+	  and slightly confusing test. [ XInternAtom (,,TRUE)
+	  will never return None ].
+
+	* gtk/testgtk.c (main): Add a check to see if we
+	  are being run from the correct directory and
+	  to quit nicely if we are not.
+
+	* gtk/gtkrc.c (gtk_rc_slist_remove_all): Make function
+	  static.
+
+	* configure.in (REBUILD): Change check for perl5
+	  to check explicitely for v >= 5.002. (5.001
+	  does not work with our scripts.)
+
 Thu Sep  2 23:00:03 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkenums.h (GtkWindowPosition): added GTK_WIN_POS_CENTER_ALWAYS.
diff --git a/configure.in b/configure.in
index 7d118127a..dd734f61d 100644
--- a/configure.in
+++ b/configure.in
@@ -159,7 +159,7 @@ AC_CHECK_PROG(INDENT, indent, indent)
 REBUILD=\#
 if test "x$enable_rebuilds" = "xyes" && \
      test -n "$PERL" && \
-     $PERL -v | grep 'version 5.' > /dev/null && \
+     $PERL -e 'exit !($] >= 5.002)' > /dev/null && \
      test -n "$AWK" ; then
   REBUILD=
 fi
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 514286bf2..725cf621b 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -1621,7 +1621,7 @@ gdk_event_translate (GdkEvent *event,
       
       return_val = window_private && !window_private->destroyed;
       
-      if(window && window_private->xwindow != GDK_ROOT_WINDOW())
+      if (window && window_private->xwindow != GDK_ROOT_WINDOW())
 	gdk_window_destroy_notify (window);
       break;
       
diff --git a/gdk/gdkproperty.c b/gdk/gdkproperty.c
index 59c3e38df..7973d8fc7 100644
--- a/gdk/gdkproperty.c
+++ b/gdk/gdkproperty.c
@@ -45,7 +45,7 @@ gdk_atom_intern (const gchar *atom_name,
     {
       retval = XInternAtom (gdk_display, atom_name, only_if_exists);
 
-      if (retval != None || !only_if_exists)
+      if (retval != None)
 	g_hash_table_insert (atom_hash, 
 			     g_strdup (atom_name), 
 			     GUINT_TO_POINTER (retval));
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 514286bf2..725cf621b 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1621,7 +1621,7 @@ gdk_event_translate (GdkEvent *event,
       
       return_val = window_private && !window_private->destroyed;
       
-      if(window && window_private->xwindow != GDK_ROOT_WINDOW())
+      if (window && window_private->xwindow != GDK_ROOT_WINDOW())
 	gdk_window_destroy_notify (window);
       break;
       
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 59c3e38df..7973d8fc7 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -45,7 +45,7 @@ gdk_atom_intern (const gchar *atom_name,
     {
       retval = XInternAtom (gdk_display, atom_name, only_if_exists);
 
-      if (retval != None || !only_if_exists)
+      if (retval != None)
 	g_hash_table_insert (atom_hash, 
 			     g_strdup (atom_name), 
 			     GUINT_TO_POINTER (retval));
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index f664e067d..5e3e639c9 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -569,7 +569,7 @@ gtk_rc_style_ref (GtkRcStyle  *rc_style)
 }
 
 /* Like g_slist_remove, but remove all copies of data */
-GSList*
+static GSList*
 gtk_rc_slist_remove_all (GSList   *list,
 			 gpointer  data)
 {
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index 2dd73154b..d638c6376 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -30,7 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <sys/stat.h>
 #include <time.h>
+#include <unistd.h>
 #include "gtk.h"
 #include "../gdk/gdk.h"
 #include "../gdk/gdkx.h"
@@ -8349,11 +8351,22 @@ int
 main (int argc, char *argv[])
 {
   GtkBindingSet *binding_set;
+  struct stat statbuf;
 
   srand (time (NULL));
 
   gtk_set_locale ();
 
+  /* Check to see if we are being run from the correct
+   * directory.
+   */
+  if (stat("./testgtkrc", &statbuf) < 0)
+    {
+      fprintf (stderr, "*** The testgtk program must be run from within the\n"
+	               "*** gtk/ subdirectory of the GTK+ distribution.\n");
+      exit (1);
+    }
+
   gtk_rc_add_default_file ("testgtkrc");
 
   gtk_init (&argc, &argv);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 2dd73154b..d638c6376 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -30,7 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <sys/stat.h>
 #include <time.h>
+#include <unistd.h>
 #include "gtk.h"
 #include "../gdk/gdk.h"
 #include "../gdk/gdkx.h"
@@ -8349,11 +8351,22 @@ int
 main (int argc, char *argv[])
 {
   GtkBindingSet *binding_set;
+  struct stat statbuf;
 
   srand (time (NULL));
 
   gtk_set_locale ();
 
+  /* Check to see if we are being run from the correct
+   * directory.
+   */
+  if (stat("./testgtkrc", &statbuf) < 0)
+    {
+      fprintf (stderr, "*** The testgtk program must be run from within the\n"
+	               "*** gtk/ subdirectory of the GTK+ distribution.\n");
+      exit (1);
+    }
+
   gtk_rc_add_default_file ("testgtkrc");
 
   gtk_init (&argc, &argv);