diff --git a/ChangeLog b/ChangeLog
index df8bfa3bf5..c5eeb00280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-05  Anders Carlsson  <andersca@gnome.org>
+
+	* gdk/gdk.c (gdk_arg_context_parse): Handle '--' correctly.
+
 Fri Apr  2 17:57:33 2004  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): set the height
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index df8bfa3bf5..c5eeb00280 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2004-04-05  Anders Carlsson  <andersca@gnome.org>
+
+	* gdk/gdk.c (gdk_arg_context_parse): Handle '--' correctly.
+
 Fri Apr  2 17:57:33 2004  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): set the height
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index df8bfa3bf5..c5eeb00280 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2004-04-05  Anders Carlsson  <andersca@gnome.org>
+
+	* gdk/gdk.c (gdk_arg_context_parse): Handle '--' correctly.
+
 Fri Apr  2 17:57:33 2004  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): set the height
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index df8bfa3bf5..c5eeb00280 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2004-04-05  Anders Carlsson  <andersca@gnome.org>
+
+	* gdk/gdk.c (gdk_arg_context_parse): Handle '--' correctly.
+
 Fri Apr  2 17:57:33 2004  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): set the height
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index df8bfa3bf5..c5eeb00280 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2004-04-05  Anders Carlsson  <andersca@gnome.org>
+
+	* gdk/gdk.c (gdk_arg_context_parse): Handle '--' correctly.
+
 Fri Apr  2 17:57:33 2004  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): set the height
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 567cc4f57a..cf3e98cb80 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -116,7 +116,7 @@ gdk_arg_context_parse (GdkArgContext *context, gint *argc, gchar ***argv)
 	  arg = (*argv)[i] + 2;
 
 	  /* '--' terminates list of arguments */
-	  if (arg == 0)
+	  if (*arg == 0)
 	    {
 	      (*argv)[i] = NULL;
 	      break;