From 3bfc888d4a6fa39517f675e0b6d5cae268f46e84 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 5 Apr 2004 20:39:31 +0000 Subject: [PATCH] Handle '--' correctly. 2004-04-05 Anders Carlsson * gdk/gdk.c (gdk_arg_context_parse): Handle '--' correctly. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gdk/gdk.c | 2 +- 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index df8bfa3bf5..c5eeb00280 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-04-05 Anders Carlsson + + * gdk/gdk.c (gdk_arg_context_parse): Handle '--' correctly. + Fri Apr 2 17:57:33 2004 Jonathan Blandford * 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 + + * gdk/gdk.c (gdk_arg_context_parse): Handle '--' correctly. + Fri Apr 2 17:57:33 2004 Jonathan Blandford * 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 + + * gdk/gdk.c (gdk_arg_context_parse): Handle '--' correctly. + Fri Apr 2 17:57:33 2004 Jonathan Blandford * 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 + + * gdk/gdk.c (gdk_arg_context_parse): Handle '--' correctly. + Fri Apr 2 17:57:33 2004 Jonathan Blandford * 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 + + * gdk/gdk.c (gdk_arg_context_parse): Handle '--' correctly. + Fri Apr 2 17:57:33 2004 Jonathan Blandford * 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;