Initialize gdk_error_code to zero before calling the X routine.

Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>

	* gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to
	zero before calling the X routine.

9 files changed, 44 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 5530bec555..c21ce9e6bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to
+	zero before calling the X routine.
+
 Tue Mar  3 01:22:25 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkspinbutton.c: applied patch from lars and steffan to proper
@@ -28,6 +33,7 @@ Mon Mar  2 17:48:38 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/testgtk.c: GList where there should have been GSList
 
+>>>>>>> 1.174
 Mon Mar  2 12:26:59 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5530bec555..c21ce9e6bf 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to
+	zero before calling the X routine.
+
 Tue Mar  3 01:22:25 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkspinbutton.c: applied patch from lars and steffan to proper
@@ -28,6 +33,7 @@ Mon Mar  2 17:48:38 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/testgtk.c: GList where there should have been GSList
 
+>>>>>>> 1.174
 Mon Mar  2 12:26:59 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5530bec555..c21ce9e6bf 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to
+	zero before calling the X routine.
+
 Tue Mar  3 01:22:25 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkspinbutton.c: applied patch from lars and steffan to proper
@@ -28,6 +33,7 @@ Mon Mar  2 17:48:38 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/testgtk.c: GList where there should have been GSList
 
+>>>>>>> 1.174
 Mon Mar  2 12:26:59 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5530bec555..c21ce9e6bf 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to
+	zero before calling the X routine.
+
 Tue Mar  3 01:22:25 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkspinbutton.c: applied patch from lars and steffan to proper
@@ -28,6 +33,7 @@ Mon Mar  2 17:48:38 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/testgtk.c: GList where there should have been GSList
 
+>>>>>>> 1.174
 Mon Mar  2 12:26:59 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5530bec555..c21ce9e6bf 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to
+	zero before calling the X routine.
+
 Tue Mar  3 01:22:25 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkspinbutton.c: applied patch from lars and steffan to proper
@@ -28,6 +33,7 @@ Mon Mar  2 17:48:38 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/testgtk.c: GList where there should have been GSList
 
+>>>>>>> 1.174
 Mon Mar  2 12:26:59 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5530bec555..c21ce9e6bf 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to
+	zero before calling the X routine.
+
 Tue Mar  3 01:22:25 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkspinbutton.c: applied patch from lars and steffan to proper
@@ -28,6 +33,7 @@ Mon Mar  2 17:48:38 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/testgtk.c: GList where there should have been GSList
 
+>>>>>>> 1.174
 Mon Mar  2 12:26:59 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5530bec555..c21ce9e6bf 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to
+	zero before calling the X routine.
+
 Tue Mar  3 01:22:25 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkspinbutton.c: applied patch from lars and steffan to proper
@@ -28,6 +33,7 @@ Mon Mar  2 17:48:38 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/testgtk.c: GList where there should have been GSList
 
+>>>>>>> 1.174
 Mon Mar  2 12:26:59 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/gdk/gdkproperty.c b/gdk/gdkproperty.c
index 8eaba3aae9..40140a026a 100644
--- a/gdk/gdkproperty.c
+++ b/gdk/gdkproperty.c
@@ -39,6 +39,7 @@ gdk_atom_name (GdkAtom atom)
      we take precautions */
 
   gdk_error_warnings = 0;
+  gdk_error_code = 0;
   t = XGetAtomName (gdk_display, atom);
   gdk_error_warnings = 1;
 
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 8eaba3aae9..40140a026a 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -39,6 +39,7 @@ gdk_atom_name (GdkAtom atom)
      we take precautions */
 
   gdk_error_warnings = 0;
+  gdk_error_code = 0;
   t = XGetAtomName (gdk_display, atom);
   gdk_error_warnings = 1;