Merge 2.53.3 into tizen
authorAdrian Szyndela <adrian.s@samsung.com>
Fri, 17 Jan 2020 11:15:05 +0000 (12:15 +0100)
committerAdrian Szyndela <adrian.s@samsung.com>
Tue, 28 Jan 2020 12:15:16 +0000 (13:15 +0100)
Change-Id: Iacdfcab900941fbdd53a919b0ecfda0cafeca486

66 files changed:
1  2 
NEWS
configure.ac
gio/Makefile.am
gio/gapplicationimpl-dbus.c
gio/gdbus-2.0/codegen/codegen.py
gio/gdbusactiongroup.h
gio/gdbusaddress.c
gio/gdbusaddress.h
gio/gdbusauth.c
gio/gdbusauthobserver.h
gio/gdbusconnection.c
gio/gdbusconnection.h
gio/gdbuserror.h
gio/gdbusinterface.h
gio/gdbusinterfaceskeleton.h
gio/gdbusintrospection.h
gio/gdbusmenumodel.h
gio/gdbusmessage.c
gio/gdbusmessage.h
gio/gdbusmethodinvocation.c
gio/gdbusmethodinvocation.h
gio/gdbusnameowning.h
gio/gdbusnamewatching.c
gio/gdbusnamewatching.h
gio/gdbusobject.h
gio/gdbusobjectmanager.h
gio/gdbusobjectmanagerclient.c
gio/gdbusobjectmanagerclient.h
gio/gdbusobjectmanagerserver.h
gio/gdbusprivate.c
gio/gdbusprivate.h
gio/gdbusproxy.c
gio/gdbusproxy.h
gio/gdbusserver.h
gio/gdbusutils.c
gio/gdbusutils.h
gio/gfile.c
gio/gioenums.h
gio/gunixfdlist.h
glib/gbytes.c
glib/gbytes.h
glib/gfileutils.c
glib/glib-autocleanups.h
glib/glib-private.c
glib/glib-private.h
glib/glib-unix.c
glib/glib-unix.h
glib/gmarkup.c
glib/gmessages.c
glib/gmessages.h
glib/grand.c
glib/gslice.c
glib/gtestutils.c
glib/gtestutils.h
glib/gvariant-core.c
glib/gvariant-core.h
glib/gvariant-parser.c
glib/gvariant-serialiser.c
glib/gvariant-serialiser.h
glib/gvariant.c
glib/gvariant.h
glib/gvarianttype.c
glib/gvarianttype.h
glib/gvarianttypeinfo.c
glib/tests/bytes.c
glib/tests/gvariant.c

diff --cc NEWS
Simple merge
diff --cc configure.ac
Simple merge
diff --cc gio/Makefile.am
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gio/gdbusauth.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 306627b,9fb6dd1..6575464
mode 100755,100644..100755
@@@ -318,15 -356,8 +352,15 @@@ on_name_owner_changed (GDBusConnection 
        call_appeared_handler (client);
      }
  
 +  /* initialized set to TRUE means that signal was delivered and processed.
 +   * Now, if we receive a reply to GetNameOwner call, we may just ignore it as it carries the same
 +   * information as the current signal, or if something changed in the meantime we will
 +   * get next signal very soon.
 +   */
 +  client->initialized = TRUE;
 +
   out:
-   ;
+   client_unref (client);
  }
  
  /* ---------------------------------------------------------------------------------------------------- */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gio/gfile.c
Simple merge
diff --cc gio/gioenums.h
Simple merge
Simple merge
diff --cc glib/gbytes.c
Simple merge
diff --cc glib/gbytes.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc glib/gmarkup.c
Simple merge
Simple merge
Simple merge
diff --cc glib/grand.c
Simple merge
diff --cc glib/gslice.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc glib/gvariant.c
Simple merge
diff --cc glib/gvariant.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge