[Xfce4-commits] [xfce/xfconf] 31/31: Merge branch 'gdbus-port' into master.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   l   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfconf.

commit 90cc1974a569efee1f0298b8efb0770246c4b9f8
Merge: 71d0a41 449aeb9
Author: Ali Abdallah <aliovx at gmail.com>
Date:   Thu Jun 1 10:51:25 2017 +0200

    Merge branch 'gdbus-port' into master.

 common/Makefile.am                              |  41 ++-
 common/xfconf-common-private.h                  |   4 -
 common/xfconf-dbus.xml                          |  14 +-
 common/xfconf-errors.c                          |  27 +-
 common/xfconf-gvaluefuncs.c                     | 321 +++++++++++++++++-
 common/xfconf-gvaluefuncs.h                     |  14 +
 configure.ac.in                                 |  17 +-
 docs/reference/Makefile.am                      |   8 +-
 tests/Makefile.inc                              |   4 +-
 tests/tests-common.h                            |  38 +--
 xfconf-perl/Makefile.PL.in                      |   4 +-
 xfconf-perl/xs/XfconfBinding.xs                 |   2 +-
 xfconf-perl/xs/XfconfChannel.xs                 |   8 +-
 xfconf-query/Makefile.am                        |   6 +-
 xfconf-query/main.c                             |  10 +-
 xfconf/Makefile.am                              |  42 +--
 xfconf/abicheck.sh                              |   2 +-
 xfconf/{libxfconf-0.pc.in => libxfconf-1.pc.in} |   2 +-
 xfconf/xfconf-cache.c                           | 418 ++++++++++++++----------
 xfconf/xfconf-channel.c                         | 138 +++-----
 xfconf/xfconf-private.h                         |   7 +-
 xfconf/xfconf.c                                 |  81 ++---
 xfconfd/Makefile.am                             |  25 +-
 xfconfd/main.c                                  |  23 ++
 xfconfd/xfconf-backend-factory.c                |   1 +
 xfconfd/xfconf-backend-perchannel-xml.c         |   7 +-
 xfconfd/xfconf-backend.c                        |   2 -
 xfconfd/xfconf-backend.h                        |   1 +
 xfconfd/xfconf-daemon.c                         | 365 +++++++++------------
 xfconfd/xfconf-daemon.h                         |   1 +
 30 files changed, 957 insertions(+), 676 deletions(-)

diff --cc configure.ac.in
index c6d78b2,7651f5d..798c56b
--- a/configure.ac.in
+++ b/configure.ac.in
@@@ -7,10 -7,10 +7,10 @@@ dn
  
  dnl version info
  m4_define([libxfconf_verinfo], [2:0:0])
- m4_define([libxfconf_version_api], [0])
+ m4_define([libxfconf_version_api], [1])
  m4_define([xfconf_version_major], [4])
 -m4_define([xfconf_version_minor], [13])
 -m4_define([xfconf_version_micro], [0])
 +m4_define([xfconf_version_minor], [12])
 +m4_define([xfconf_version_micro], [1])
  m4_define([xfconf_version_nano], [])
  m4_define([xfconf_version_build], [@REVISION@])
  m4_define([xfconf_version_tag], [git])

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.