Properly store changes for arrays. (#308528, Roger Leigh)

2005-06-22  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_arg): Properly store changes for arrays.  (#308528,
	Roger Leigh)

diff --git a/ChangeLog b/ChangeLog
index 8946716..8646c55 100644 (file)
--- 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  <tml@novell.com>
 
        * 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 (file)
--- 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  <tml@novell.com>
 
        * 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 (file)
--- 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  <tml@novell.com>
 
        * 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 (file)
--- 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  <tml@novell.com>
 
        * glib/gfileutils.c (g_makepath): New function. Creates a

diff --git a/glib/goption.c b/glib/goption.c
index a432aca..efa4271 100644 (file)
--- 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