From f8411a5b97e1327d28f6c18d133a28c9cf8b5dcd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 22 Jun 2005 17:09:31 +0000 Subject: [PATCH] Properly store changes for arrays. (#308528, Roger Leigh) 2005-06-22 Matthias Clasen * glib/goption.c (parse_arg): Properly store changes for arrays. (#308528, Roger Leigh) --- ChangeLog | 4 +++- ChangeLog.pre-2-10 | 4 +++- ChangeLog.pre-2-12 | 4 +++- ChangeLog.pre-2-8 | 4 +++- glib/goption.c | 4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8946716..8646c55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,9 @@ * glib/goption.c (parse_short_option, parse_long_option): Pass the option name also in the NO_ARG case. (#308602, Masatake YAMATO) - + (parse_arg): Properly store changes for arrays. (#308528, + Roger Leigh) + 2005-06-22 Tor Lillqvist * glib/gfileutils.c (g_makepath): New function. Creates a diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8946716..8646c55 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -3,7 +3,9 @@ * glib/goption.c (parse_short_option, parse_long_option): Pass the option name also in the NO_ARG case. (#308602, Masatake YAMATO) - + (parse_arg): Properly store changes for arrays. (#308528, + Roger Leigh) + 2005-06-22 Tor Lillqvist * glib/gfileutils.c (g_makepath): New function. Creates a diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 8946716..8646c55 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -3,7 +3,9 @@ * glib/goption.c (parse_short_option, parse_long_option): Pass the option name also in the NO_ARG case. (#308602, Masatake YAMATO) - + (parse_arg): Properly store changes for arrays. (#308528, + Roger Leigh) + 2005-06-22 Tor Lillqvist * glib/gfileutils.c (g_makepath): New function. Creates a diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8946716..8646c55 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -3,7 +3,9 @@ * glib/goption.c (parse_short_option, parse_long_option): Pass the option name also in the NO_ARG case. (#308602, Masatake YAMATO) - + (parse_arg): Properly store changes for arrays. (#308528, + Roger Leigh) + 2005-06-22 Tor Lillqvist * glib/gfileutils.c (g_makepath): New function. Creates a diff --git a/glib/goption.c b/glib/goption.c index a432aca..efa4271 100644 --- a/glib/goption.c +++ b/glib/goption.c @@ -758,7 +758,7 @@ parse_arg (GOptionContext *context, if (change->allocated.array.len == 0) { - change->prev.array = entry->arg_data; + change->prev.array = *(gchar ***)entry->arg_data; change->allocated.array.data = g_new (gchar *, 2); } else @@ -816,7 +816,7 @@ parse_arg (GOptionContext *context, if (change->allocated.array.len == 0) { - change->prev.array = entry->arg_data; + change->prev.array = *(gchar ***)entry->arg_data; change->allocated.array.data = g_new (gchar *, 2); } else -- 2.7.4