Merge 2.57.3 into tizen
authorAdrian Szyndela <adrian.s@samsung.com>
Fri, 17 Jan 2020 14:38:45 +0000 (15:38 +0100)
committerAdrian Szyndela <adrian.s@samsung.com>
Tue, 28 Jan 2020 12:23:46 +0000 (13:23 +0100)
Change-Id: I37491b4aeec59c33f3b0cd8c82364d4d3dcc5de4

1  2 
NEWS
configure.ac
gio/gapplicationimpl-dbus.c
gio/gdbusmessage.c
gio/tests/Makefile.am
glib/gbytes.c
glib/gtestutils.c
glib/gvariant-parser.c
glib/tests/gvariant.c

diff --cc NEWS
Simple merge
diff --cc configure.ac
Simple merge
@@@ -425,14 -426,22 +425,13 @@@ g_application_impl_attempt_primary (GAp
     * the well-known name and fall back to remote mode (!is_primary)
     * in the case that we can't do that.
     */
-   /* DBUS_NAME_FLAG_DO_NOT_QUEUE: 0x4 */
 -  reply = g_dbus_connection_call_sync (impl->session_bus, "org.freedesktop.DBus", "/org/freedesktop/DBus",
 -                                       "org.freedesktop.DBus", "RequestName",
 -                                       g_variant_new ("(su)",
 -                                                      impl->bus_name,
 -                                                      G_BUS_NAME_OWNER_FLAGS_DO_NOT_QUEUE),
 -                                       G_VARIANT_TYPE ("(u)"),
 -                                       0, -1, cancellable, error);
 -
 -  if (reply == NULL)
 -    return FALSE;
 +  rval = g_dbus_request_name (impl->session_bus, impl->bus_name, G_BUS_NAME_OWNER_FLAGS_DO_NOT_QUEUE, error);
  
 -  g_variant_get (reply, "(u)", &rval);
 -  g_variant_unref (reply);
 +  if (rval == G_BUS_REQUEST_NAME_FLAGS_ERROR)
 +    return FALSE;
  
    /* DBUS_REQUEST_NAME_REPLY_EXISTS: 3 */
 -  impl->primary = (rval != 3);
 +  impl->primary = (rval != G_BUS_REQUEST_NAME_FLAGS_EXISTS);
  
    return TRUE;
  }
Simple merge
Simple merge
diff --cc glib/gbytes.c
Simple merge
Simple merge
Simple merge
Simple merge