[Xfce4-commits] <xfce4-panel:master> Migrate: Make code work with inlined array values.

[Nick Schermer]

Updating branch refs/heads/master
         to 60c9ae45170bcd56e29126793f9b85c73350ce2f (commit)
       from f0b084486e981518b19eaa978df3615e3c250738 (commit)

commit 60c9ae45170bcd56e29126793f9b85c73350ce2f
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Dec 29 19:03:43 2011 +0100

    Migrate: Make code work with inlined array values.

 migrate/migrate-default.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/migrate/migrate-default.c b/migrate/migrate-default.c
index 382c858..d155fd8 100644
--- a/migrate/migrate-default.c
+++ b/migrate/migrate-default.c
@@ -172,6 +172,17 @@ migrate_default_start_element_handler (GMarkupParseContext  *context,
       prop_value = NULL;
       prop_type = NULL;
 
+      /* check if we need to flush an array */
+      if (parser->array != NULL)
+        {
+          prop_path = migrate_default_property_path (parser);
+          xfconf_channel_set_arrayv (parser->channel, prop_path, parser->array);
+          g_free (prop_path);
+
+          xfconf_array_free (parser->array);
+          parser->array = NULL;
+        }
+
       if (G_LIKELY (attribute_names != NULL))
         {
           for (i = 0; attribute_names[i] != NULL; i++)