[json-glib: 10/11] Merge branch 'master-old'



commit a8bd5f95894a4daf7644e3ec7e808872e5003973
Merge: a6e5dd1 0c01de6
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Jul 10 16:17:19 2017 +0100

    Merge branch 'master-old'

 doc/json-glib-sections.txt     |    1 +
 json-glib/json-generator.c     |   50 +++++++++++++++++++++++++++------------
 json-glib/json-generator.h     |    4 +++
 json-glib/json-gobject.c       |   21 ++++++----------
 json-glib/json-gvariant.c      |   20 +++++----------
 json-glib/json-object.c        |   34 ++++++++++++++------------
 json-glib/json-path.c          |   14 ++++------
 json-glib/json-reader.c        |   23 ++++++++----------
 json-glib/json-types-private.h |    6 +++-
 9 files changed, 92 insertions(+), 81 deletions(-)
---
diff --cc json-glib/json-gobject.c
index a7a53a2,abfbb8b..076517b
--- a/json-glib/json-gobject.c
+++ b/json-glib/json-gobject.c
@@@ -244,10 -245,9 +245,10 @@@ json_gobject_new (GType       gtype
          }
  
      next_member:
-       members_left = g_list_prepend (members_left, l->data);
+       g_queue_push_tail (&members_left, l->data);
      }
  
 +  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    retval = g_object_newv (gtype,
                            construct_params->len,
                            (GParameter *) construct_params->data);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]