diff options
| -rw-r--r-- | common/xfconf-dbus.xml | 2 | ||||
| -rw-r--r-- | xfconf/Makefile.am | 13 | ||||
| -rw-r--r-- | xfconf/xfconf-channel.c | 9 |
3 files changed, 19 insertions, 5 deletions
diff --git a/common/xfconf-dbus.xml b/common/xfconf-dbus.xml index 7034767..4c91465 100644 --- a/common/xfconf-dbus.xml +++ b/common/xfconf-dbus.xml @@ -6,6 +6,8 @@ value="xfconf"/> <annotation name="org.freedesktop.DBus.GLib.ClientCSymbol" value="xfconf_client"/> + + <annotation name="org.gtk.GDBus.C.Name" value="Client" /> <!-- void org.xfce.Xfconf.SetProperty(String channel, diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am index 42bd8eb..9edb51e 100644 --- a/xfconf/Makefile.am +++ b/xfconf/Makefile.am @@ -22,6 +22,7 @@ libxfconf_0_la_SOURCES = \ xfconf-cache.h \ xfconf-channel.c \ xfconf-dbus-bindings.h \ + xfconf-gdbus-bindings.c \ xfconf-private.h \ xfconf.c \ $(top_srcdir)/common/xfconf-types.c @@ -59,7 +60,17 @@ pkgconfig_DATA = libxfconf-0.pc if MAINTAINER_MODE BUILT_SOURCES = \ - xfconf-dbus-bindings.h + xfconf-dbus-bindings.h \ + xfconf-gdbus-bindings.c \ + xfconf-gdbus-bindings.h + +xfconf-gdbus-bindings.h: +xfconf-gdbus-bindings.c: $(top_srcdir)/common/xfconf-dbus.xml Makefile + $(AM_V_GEN) $(GDBUS_CODEGEN) \ + --interface-prefix org.xfce.Xfconf \ + --c-namespace Xfconf \ + --generate-c-code xfconf-gdbus-bindings \ + $< xfconf-dbus-bindings.h: $(top_srcdir)/common/xfconf-dbus.xml Makefile $(AM_V_GEN) dbus-binding-tool --mode=glib-client $< > $(@).tmp \ diff --git a/xfconf/xfconf-channel.c b/xfconf/xfconf-channel.c index b44b1da..36850f1 100644 --- a/xfconf/xfconf-channel.c +++ b/xfconf/xfconf-channel.c @@ -29,6 +29,7 @@ #include "xfconf-channel.h" #include "xfconf-cache.h" #include "xfconf-dbus-bindings.h" +#include "xfconf-gdbus-bindings.h" #include "common/xfconf-gvaluefuncs.h" #include "xfconf-private.h" #include "common/xfconf-marshal.h" @@ -663,13 +664,13 @@ gboolean xfconf_channel_is_property_locked(XfconfChannel *channel, const gchar *property) { - DBusGProxy *proxy = _xfconf_get_dbus_g_proxy(); + GDBusProxy *proxy = _xfconf_get_gdbus_proxy(); gboolean locked = FALSE; gchar *real_property = REAL_PROP(channel, property); ERROR_DEFINE; - - if(!xfconf_client_is_property_locked(proxy, channel->channel_name, - property, &locked, ERROR)) + + if (!xfconf_client_call_is_property_locked_sync (proxy, channel->channel_name, + property, &locked, NULL, ERROR)) { ERROR_CHECK; locked = FALSE; |