From 599b862f9810b6f6f7224517b088c97ea1a2a109 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 21 Jan 2002 15:41:47 +0000 Subject: [PATCH] Fix wrong types for command line arguments (#69124, Ryan Lovett) Mon Jan 21 10:29:45 2002 Owen Taylor * gdk/gdk.c: Fix wrong types for command line arguments (#69124, Ryan Lovett) * gdk/gdk.c (gdk_arg_context_parse): Fix bug in parsing parsing '--arg VALUE'. * gdk/gdk.c: Remove unused variable gdk_error_trap_free_list. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-0 | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gdk/gdk.c | 8 +++----- 8 files changed, 73 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d72d8102e8..834307dd0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon Jan 21 10:29:45 2002 Owen Taylor + + * gdk/gdk.c: Fix wrong types for command line arguments + (#69124, Ryan Lovett) + + * gdk/gdk.c (gdk_arg_context_parse): Fix bug in parsing + parsing '--arg VALUE'. + + * gdk/gdk.c: Remove unused variable gdk_error_trap_free_list. + 2002-01-21 Havoc Pennington * gdk/gdkwindow.c (gdk_window_add_filter): mention that window diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index d72d8102e8..834307dd0a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +Mon Jan 21 10:29:45 2002 Owen Taylor + + * gdk/gdk.c: Fix wrong types for command line arguments + (#69124, Ryan Lovett) + + * gdk/gdk.c (gdk_arg_context_parse): Fix bug in parsing + parsing '--arg VALUE'. + + * gdk/gdk.c: Remove unused variable gdk_error_trap_free_list. + 2002-01-21 Havoc Pennington * gdk/gdkwindow.c (gdk_window_add_filter): mention that window diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d72d8102e8..834307dd0a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Mon Jan 21 10:29:45 2002 Owen Taylor + + * gdk/gdk.c: Fix wrong types for command line arguments + (#69124, Ryan Lovett) + + * gdk/gdk.c (gdk_arg_context_parse): Fix bug in parsing + parsing '--arg VALUE'. + + * gdk/gdk.c: Remove unused variable gdk_error_trap_free_list. + 2002-01-21 Havoc Pennington * gdk/gdkwindow.c (gdk_window_add_filter): mention that window diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d72d8102e8..834307dd0a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Mon Jan 21 10:29:45 2002 Owen Taylor + + * gdk/gdk.c: Fix wrong types for command line arguments + (#69124, Ryan Lovett) + + * gdk/gdk.c (gdk_arg_context_parse): Fix bug in parsing + parsing '--arg VALUE'. + + * gdk/gdk.c: Remove unused variable gdk_error_trap_free_list. + 2002-01-21 Havoc Pennington * gdk/gdkwindow.c (gdk_window_add_filter): mention that window diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d72d8102e8..834307dd0a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Mon Jan 21 10:29:45 2002 Owen Taylor + + * gdk/gdk.c: Fix wrong types for command line arguments + (#69124, Ryan Lovett) + + * gdk/gdk.c (gdk_arg_context_parse): Fix bug in parsing + parsing '--arg VALUE'. + + * gdk/gdk.c: Remove unused variable gdk_error_trap_free_list. + 2002-01-21 Havoc Pennington * gdk/gdkwindow.c (gdk_window_add_filter): mention that window diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d72d8102e8..834307dd0a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Mon Jan 21 10:29:45 2002 Owen Taylor + + * gdk/gdk.c: Fix wrong types for command line arguments + (#69124, Ryan Lovett) + + * gdk/gdk.c (gdk_arg_context_parse): Fix bug in parsing + parsing '--arg VALUE'. + + * gdk/gdk.c: Remove unused variable gdk_error_trap_free_list. + 2002-01-21 Havoc Pennington * gdk/gdkwindow.c (gdk_window_add_filter): mention that window diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d72d8102e8..834307dd0a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Mon Jan 21 10:29:45 2002 Owen Taylor + + * gdk/gdk.c: Fix wrong types for command line arguments + (#69124, Ryan Lovett) + + * gdk/gdk.c (gdk_arg_context_parse): Fix bug in parsing + parsing '--arg VALUE'. + + * gdk/gdk.c: Remove unused variable gdk_error_trap_free_list. + 2002-01-21 Havoc Pennington * gdk/gdkwindow.c (gdk_window_add_filter): mention that window diff --git a/gdk/gdk.c b/gdk/gdk.c index bca94582f6..dce2ac063e 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -50,8 +50,6 @@ static int gdk_initialized = 0; /* 1 if the library is initialized, * 0 otherwise. */ -static GSList *gdk_error_trap_free_list = NULL; /* Free list */ - static gchar *gdk_progclass = NULL; #ifdef G_ENABLE_DEBUG @@ -128,7 +126,7 @@ gdk_arg_context_parse (GdkArgContext *context, gint *argc, gchar ***argv) int len = strlen (table[k].name); if (strncmp (arg, table[k].name, len) == 0 && - (arg[len] == '=' || argc[len] == 0)) + (arg[len] == '=' || arg[len] == 0)) { char *value = NULL; @@ -228,8 +226,8 @@ gdk_arg_name_cb (const char *key, const char *value, gpointer user_data) } static GdkArgDesc gdk_args[] = { - { "class" , GDK_ARG_STRING, NULL, gdk_arg_class_cb }, - { "name", GDK_ARG_STRING, NULL, gdk_arg_name_cb }, + { "class" , GDK_ARG_CALLBACK, NULL, gdk_arg_class_cb }, + { "name", GDK_ARG_CALLBACK, NULL, gdk_arg_name_cb }, #ifdef G_ENABLE_DEBUG { "gdk-debug", GDK_ARG_CALLBACK, NULL, gdk_arg_debug_cb }, { "gdk-no-debug", GDK_ARG_CALLBACK, NULL, gdk_arg_no_debug_cb },