Merge 2.56.2 up to 2.57.1 into tizen
authorAdrian Szyndela <adrian.s@samsung.com>
Fri, 17 Jan 2020 11:43:44 +0000 (12:43 +0100)
committerAdrian Szyndela <adrian.s@samsung.com>
Tue, 28 Jan 2020 12:22:44 +0000 (13:22 +0100)
Change-Id: I4ee99f4126125121280ae7be4bd81821e67e5e0f

17 files changed:
1  2 
NEWS
configure.ac
docs/reference/glib/glib-sections.txt
gio/Makefile.am
gio/gdbus-2.0/codegen/codegen.py
gio/gdbusauth.c
gio/gdbusconnection.c
gio/gdbusobjectmanagerclient.c
gio/gdbusprivate.c
gio/gdbusprivate.h
gio/gdbusproxy.c
gio/gfile.c
gio/tests/Makefile.am
glib/gfileutils.c
glib/glib-unix.c
glib/gslice.c
glib/gtestutils.c

diff --cc NEWS
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
diff --cc gio/Makefile.am
Simple merge
Simple merge
diff --cc gio/gdbusauth.c
Simple merge
Simple merge
Simple merge
@@@ -138,20 -141,13 +138,24 @@@ void _g_dbus_object_proxy_add_interfac
  void _g_dbus_object_proxy_remove_interface (GDBusObjectProxy *proxy,
                                              const gchar      *interface_name);
  
+ gchar *_g_dbus_hexencode (const gchar *str,
+                           gsize        str_len);
  /* Implemented in gdbusconnection.c */
  GDBusConnection *_g_bus_get_singleton_if_exists (GBusType bus_type);
+ void             _g_bus_forget_singleton        (GBusType bus_type);
  
 +void g_dbus_message_init_header_iter (GDBusMessage   *message,
 +                                      GHashTableIter *iter);
 +
 +GObject *
 +g_dbus_address_get_stream_internal (const gchar   *address,
 +                                    gboolean       kdbus_okay,
 +                                    gchar        **out_uuid,
 +                                    GCancellable  *cancellable,
 +                                    GError       **error);
 +
 +
  G_END_DECLS
  
  #endif /* __G_DBUS_PRIVATE_H__ */
Simple merge
diff --cc gio/gfile.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc glib/gslice.c
Simple merge
Simple merge