From 32e4ee53334fe5df4e4d8478bc11b1bdb980692a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 22 Jun 2005 17:09:03 +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 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/goption.c | 4 ++-- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0381fc72..97b8e7dde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-06-22 Matthias Clasen + + * glib/goption.c (parse_arg): Properly store changes + for arrays. (#308528, Roger Leigh) + 2005-06-21 Runa Bhattacharjee * configure.in: Added "te" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e0381fc72..97b8e7dde 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-06-22 Matthias Clasen + + * glib/goption.c (parse_arg): Properly store changes + for arrays. (#308528, Roger Leigh) + 2005-06-21 Runa Bhattacharjee * configure.in: Added "te" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index e0381fc72..97b8e7dde 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2005-06-22 Matthias Clasen + + * glib/goption.c (parse_arg): Properly store changes + for arrays. (#308528, Roger Leigh) + 2005-06-21 Runa Bhattacharjee * configure.in: Added "te" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e0381fc72..97b8e7dde 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-06-22 Matthias Clasen + + * glib/goption.c (parse_arg): Properly store changes + for arrays. (#308528, Roger Leigh) + 2005-06-21 Runa Bhattacharjee * configure.in: Added "te" to ALL_LINGUAS. diff --git a/glib/goption.c b/glib/goption.c index 86e404c76..2d4970956 100644 --- a/glib/goption.c +++ b/glib/goption.c @@ -732,7 +732,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 @@ -790,7 +790,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