[Xfce4-commits] [xfce/xfconf] 17/31: Get rid of all DBUS_GLIB_{CFLAGS, LIBS} and remove all the #include of dbus-glib.h.
noreply at xfce.org
noreply at xfce.org
Thu Jun 1 13:33:10 CEST 2017
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 5a498336adfc977de928d19da86808a3947e4e90
Author: Ali Abdallah <aliovx at gmail.com>
Date: Sun Apr 24 21:39:41 2016 +0200
Get rid of all DBUS_GLIB_{CFLAGS,LIBS} and remove
all the #include of dbus-glib.h.
Xfconfd does not depend on dbus-glib anymore!
---
common/xfconf-gdbus-bindings.c | 2677 -------------------------------
common/xfconf-gdbus-bindings.h | 402 -----
configure.ac.in | 2 -
docs/reference/Makefile.am | 9 +-
tests/Makefile.inc | 4 +-
xfconf-query/Makefile.am | 4 +-
xfconfd/Makefile.am | 7 +-
xfconfd/xfconf-backend-factory.c | 1 +
xfconfd/xfconf-backend-perchannel-xml.c | 1 -
xfconfd/xfconf-daemon.c | 330 ++--
xfconfd/xfconf-daemon.h | 1 +
11 files changed, 155 insertions(+), 3283 deletions(-)
diff --git a/common/xfconf-gdbus-bindings.c b/common/xfconf-gdbus-bindings.c
deleted file mode 100644
index 1ddbc70..0000000
--- a/common/xfconf-gdbus-bindings.c
+++ /dev/null
@@ -1,2677 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.48.0. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "xfconf-gdbus-bindings.h"
-
-#include <string.h>
-#ifdef G_OS_UNIX
-# include <gio/gunixfdlist.h>
-#endif
-
-typedef struct
-{
- GDBusArgInfo parent_struct;
- gboolean use_gvariant;
-} _ExtendedGDBusArgInfo;
-
-typedef struct
-{
- GDBusMethodInfo parent_struct;
- const gchar *signal_name;
- gboolean pass_fdlist;
-} _ExtendedGDBusMethodInfo;
-
-typedef struct
-{
- GDBusSignalInfo parent_struct;
- const gchar *signal_name;
-} _ExtendedGDBusSignalInfo;
-
-typedef struct
-{
- GDBusPropertyInfo parent_struct;
- const gchar *hyphen_name;
- gboolean use_gvariant;
-} _ExtendedGDBusPropertyInfo;
-
-typedef struct
-{
- GDBusInterfaceInfo parent_struct;
- const gchar *hyphen_name;
-} _ExtendedGDBusInterfaceInfo;
-
-typedef struct
-{
- const _ExtendedGDBusPropertyInfo *info;
- guint prop_id;
- GValue orig_value; /* the value before the change */
-} ChangedProperty;
-
-static void
-_changed_property_free (ChangedProperty *data)
-{
- g_value_unset (&data->orig_value);
- g_free (data);
-}
-
-static gboolean
-_g_strv_equal0 (gchar **a, gchar **b)
-{
- gboolean ret = FALSE;
- guint n;
- if (a == NULL && b == NULL)
- {
- ret = TRUE;
- goto out;
- }
- if (a == NULL || b == NULL)
- goto out;
- if (g_strv_length (a) != g_strv_length (b))
- goto out;
- for (n = 0; a[n] != NULL; n++)
- if (g_strcmp0 (a[n], b[n]) != 0)
- goto out;
- ret = TRUE;
-out:
- return ret;
-}
-
-static gboolean
-_g_variant_equal0 (GVariant *a, GVariant *b)
-{
- gboolean ret = FALSE;
- if (a == NULL && b == NULL)
- {
- ret = TRUE;
- goto out;
- }
- if (a == NULL || b == NULL)
- goto out;
- ret = g_variant_equal (a, b);
-out:
- return ret;
-}
-
-G_GNUC_UNUSED static gboolean
-_g_value_equal (const GValue *a, const GValue *b)
-{
- gboolean ret = FALSE;
- g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));
- switch (G_VALUE_TYPE (a))
- {
- case G_TYPE_BOOLEAN:
- ret = (g_value_get_boolean (a) == g_value_get_boolean (b));
- break;
- case G_TYPE_UCHAR:
- ret = (g_value_get_uchar (a) == g_value_get_uchar (b));
- break;
- case G_TYPE_INT:
- ret = (g_value_get_int (a) == g_value_get_int (b));
- break;
- case G_TYPE_UINT:
- ret = (g_value_get_uint (a) == g_value_get_uint (b));
- break;
- case G_TYPE_INT64:
- ret = (g_value_get_int64 (a) == g_value_get_int64 (b));
- break;
- case G_TYPE_UINT64:
- ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));
- break;
- case G_TYPE_DOUBLE:
- {
- /* Avoid -Wfloat-equal warnings by doing a direct bit compare */
- gdouble da = g_value_get_double (a);
- gdouble db = g_value_get_double (b);
- ret = memcmp (&da, &db, sizeof (gdouble)) == 0;
- }
- break;
- case G_TYPE_STRING:
- ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);
- break;
- case G_TYPE_VARIANT:
- ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));
- break;
- default:
- if (G_VALUE_TYPE (a) == G_TYPE_STRV)
- ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));
- else
- g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));
- break;
- }
- return ret;
-}
-
-/* ------------------------------------------------------------------------
- * Code for interface org.xfce.Xfconf
- * ------------------------------------------------------------------------
- */
-
-/**
- * SECTION:XfconfClient
- * @title: XfconfClient
- * @short_description: Generated C code for the org.xfce.Xfconf D-Bus interface
- *
- * This section contains code for working with the <link linkend="gdbus-interface-org-xfce-Xfconf.top_of_page">org.xfce.Xfconf</link> D-Bus interface in C.
- */
-
-/* ---- Introspection data for org.xfce.Xfconf ---- */
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_set_property_IN_ARG_channel =
-{
- {
- -1,
- (gchar *) "channel",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_set_property_IN_ARG_property =
-{
- {
- -1,
- (gchar *) "property",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_set_property_IN_ARG_value =
-{
- {
- -1,
- (gchar *) "value",
- (gchar *) "v",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_method_info_set_property_IN_ARG_pointers[] =
-{
- &_xfconf_client_method_info_set_property_IN_ARG_channel,
- &_xfconf_client_method_info_set_property_IN_ARG_property,
- &_xfconf_client_method_info_set_property_IN_ARG_value,
- NULL
-};
-
-static const GDBusAnnotationInfo _xfconf_client_method_set_property_annotation_info_0 =
-{
- -1,
- (gchar *) "org.freedesktop.DBus.GLib.Async",
- (gchar *) "true",
- NULL
-};
-
-static const GDBusAnnotationInfo * const _xfconf_client_method_set_property_annotation_info_pointers[] =
-{
- &_xfconf_client_method_set_property_annotation_info_0,
- NULL
-};
-
-static const _ExtendedGDBusMethodInfo _xfconf_client_method_info_set_property =
-{
- {
- -1,
- (gchar *) "SetProperty",
- (GDBusArgInfo **) &_xfconf_client_method_info_set_property_IN_ARG_pointers,
- NULL,
- (GDBusAnnotationInfo **) &_xfconf_client_method_set_property_annotation_info_pointers
- },
- "handle-set-property",
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_get_property_IN_ARG_channel =
-{
- {
- -1,
- (gchar *) "channel",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_get_property_IN_ARG_property =
-{
- {
- -1,
- (gchar *) "property",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_method_info_get_property_IN_ARG_pointers[] =
-{
- &_xfconf_client_method_info_get_property_IN_ARG_channel,
- &_xfconf_client_method_info_get_property_IN_ARG_property,
- NULL
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_get_property_OUT_ARG_value =
-{
- {
- -1,
- (gchar *) "value",
- (gchar *) "v",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_method_info_get_property_OUT_ARG_pointers[] =
-{
- &_xfconf_client_method_info_get_property_OUT_ARG_value,
- NULL
-};
-
-static const GDBusAnnotationInfo _xfconf_client_method_get_property_annotation_info_0 =
-{
- -1,
- (gchar *) "org.freedesktop.DBus.GLib.Async",
- (gchar *) "true",
- NULL
-};
-
-static const GDBusAnnotationInfo * const _xfconf_client_method_get_property_annotation_info_pointers[] =
-{
- &_xfconf_client_method_get_property_annotation_info_0,
- NULL
-};
-
-static const _ExtendedGDBusMethodInfo _xfconf_client_method_info_get_property =
-{
- {
- -1,
- (gchar *) "GetProperty",
- (GDBusArgInfo **) &_xfconf_client_method_info_get_property_IN_ARG_pointers,
- (GDBusArgInfo **) &_xfconf_client_method_info_get_property_OUT_ARG_pointers,
- (GDBusAnnotationInfo **) &_xfconf_client_method_get_property_annotation_info_pointers
- },
- "handle-get-property",
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_get_all_properties_IN_ARG_channel =
-{
- {
- -1,
- (gchar *) "channel",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_get_all_properties_IN_ARG_property_base =
-{
- {
- -1,
- (gchar *) "property_base",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_method_info_get_all_properties_IN_ARG_pointers[] =
-{
- &_xfconf_client_method_info_get_all_properties_IN_ARG_channel,
- &_xfconf_client_method_info_get_all_properties_IN_ARG_property_base,
- NULL
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_get_all_properties_OUT_ARG_properties =
-{
- {
- -1,
- (gchar *) "properties",
- (gchar *) "a{sv}",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_method_info_get_all_properties_OUT_ARG_pointers[] =
-{
- &_xfconf_client_method_info_get_all_properties_OUT_ARG_properties,
- NULL
-};
-
-static const GDBusAnnotationInfo _xfconf_client_method_get_all_properties_annotation_info_0 =
-{
- -1,
- (gchar *) "org.freedesktop.DBus.GLib.Async",
- (gchar *) "true",
- NULL
-};
-
-static const GDBusAnnotationInfo * const _xfconf_client_method_get_all_properties_annotation_info_pointers[] =
-{
- &_xfconf_client_method_get_all_properties_annotation_info_0,
- NULL
-};
-
-static const _ExtendedGDBusMethodInfo _xfconf_client_method_info_get_all_properties =
-{
- {
- -1,
- (gchar *) "GetAllProperties",
- (GDBusArgInfo **) &_xfconf_client_method_info_get_all_properties_IN_ARG_pointers,
- (GDBusArgInfo **) &_xfconf_client_method_info_get_all_properties_OUT_ARG_pointers,
- (GDBusAnnotationInfo **) &_xfconf_client_method_get_all_properties_annotation_info_pointers
- },
- "handle-get-all-properties",
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_property_exists_IN_ARG_channel =
-{
- {
- -1,
- (gchar *) "channel",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_property_exists_IN_ARG_property =
-{
- {
- -1,
- (gchar *) "property",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_method_info_property_exists_IN_ARG_pointers[] =
-{
- &_xfconf_client_method_info_property_exists_IN_ARG_channel,
- &_xfconf_client_method_info_property_exists_IN_ARG_property,
- NULL
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_property_exists_OUT_ARG_exists =
-{
- {
- -1,
- (gchar *) "exists",
- (gchar *) "b",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_method_info_property_exists_OUT_ARG_pointers[] =
-{
- &_xfconf_client_method_info_property_exists_OUT_ARG_exists,
- NULL
-};
-
-static const GDBusAnnotationInfo _xfconf_client_method_property_exists_annotation_info_0 =
-{
- -1,
- (gchar *) "org.freedesktop.DBus.GLib.Async",
- (gchar *) "true",
- NULL
-};
-
-static const GDBusAnnotationInfo * const _xfconf_client_method_property_exists_annotation_info_pointers[] =
-{
- &_xfconf_client_method_property_exists_annotation_info_0,
- NULL
-};
-
-static const _ExtendedGDBusMethodInfo _xfconf_client_method_info_property_exists =
-{
- {
- -1,
- (gchar *) "PropertyExists",
- (GDBusArgInfo **) &_xfconf_client_method_info_property_exists_IN_ARG_pointers,
- (GDBusArgInfo **) &_xfconf_client_method_info_property_exists_OUT_ARG_pointers,
- (GDBusAnnotationInfo **) &_xfconf_client_method_property_exists_annotation_info_pointers
- },
- "handle-property-exists",
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_reset_property_IN_ARG_channel =
-{
- {
- -1,
- (gchar *) "channel",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_reset_property_IN_ARG_property =
-{
- {
- -1,
- (gchar *) "property",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_reset_property_IN_ARG_recursive =
-{
- {
- -1,
- (gchar *) "recursive",
- (gchar *) "b",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_method_info_reset_property_IN_ARG_pointers[] =
-{
- &_xfconf_client_method_info_reset_property_IN_ARG_channel,
- &_xfconf_client_method_info_reset_property_IN_ARG_property,
- &_xfconf_client_method_info_reset_property_IN_ARG_recursive,
- NULL
-};
-
-static const GDBusAnnotationInfo _xfconf_client_method_reset_property_annotation_info_0 =
-{
- -1,
- (gchar *) "org.freedesktop.DBus.GLib.Async",
- (gchar *) "true",
- NULL
-};
-
-static const GDBusAnnotationInfo * const _xfconf_client_method_reset_property_annotation_info_pointers[] =
-{
- &_xfconf_client_method_reset_property_annotation_info_0,
- NULL
-};
-
-static const _ExtendedGDBusMethodInfo _xfconf_client_method_info_reset_property =
-{
- {
- -1,
- (gchar *) "ResetProperty",
- (GDBusArgInfo **) &_xfconf_client_method_info_reset_property_IN_ARG_pointers,
- NULL,
- (GDBusAnnotationInfo **) &_xfconf_client_method_reset_property_annotation_info_pointers
- },
- "handle-reset-property",
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_list_channels_OUT_ARG_channels =
-{
- {
- -1,
- (gchar *) "channels",
- (gchar *) "as",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_method_info_list_channels_OUT_ARG_pointers[] =
-{
- &_xfconf_client_method_info_list_channels_OUT_ARG_channels,
- NULL
-};
-
-static const GDBusAnnotationInfo _xfconf_client_method_list_channels_annotation_info_0 =
-{
- -1,
- (gchar *) "org.freedesktop.DBus.GLib.Async",
- (gchar *) "true",
- NULL
-};
-
-static const GDBusAnnotationInfo * const _xfconf_client_method_list_channels_annotation_info_pointers[] =
-{
- &_xfconf_client_method_list_channels_annotation_info_0,
- NULL
-};
-
-static const _ExtendedGDBusMethodInfo _xfconf_client_method_info_list_channels =
-{
- {
- -1,
- (gchar *) "ListChannels",
- NULL,
- (GDBusArgInfo **) &_xfconf_client_method_info_list_channels_OUT_ARG_pointers,
- (GDBusAnnotationInfo **) &_xfconf_client_method_list_channels_annotation_info_pointers
- },
- "handle-list-channels",
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_is_property_locked_IN_ARG_channel =
-{
- {
- -1,
- (gchar *) "channel",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_is_property_locked_IN_ARG_property =
-{
- {
- -1,
- (gchar *) "property",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_method_info_is_property_locked_IN_ARG_pointers[] =
-{
- &_xfconf_client_method_info_is_property_locked_IN_ARG_channel,
- &_xfconf_client_method_info_is_property_locked_IN_ARG_property,
- NULL
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_method_info_is_property_locked_OUT_ARG_locked =
-{
- {
- -1,
- (gchar *) "locked",
- (gchar *) "b",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_method_info_is_property_locked_OUT_ARG_pointers[] =
-{
- &_xfconf_client_method_info_is_property_locked_OUT_ARG_locked,
- NULL
-};
-
-static const GDBusAnnotationInfo _xfconf_client_method_is_property_locked_annotation_info_0 =
-{
- -1,
- (gchar *) "org.freedesktop.DBus.GLib.Async",
- (gchar *) "true",
- NULL
-};
-
-static const GDBusAnnotationInfo * const _xfconf_client_method_is_property_locked_annotation_info_pointers[] =
-{
- &_xfconf_client_method_is_property_locked_annotation_info_0,
- NULL
-};
-
-static const _ExtendedGDBusMethodInfo _xfconf_client_method_info_is_property_locked =
-{
- {
- -1,
- (gchar *) "IsPropertyLocked",
- (GDBusArgInfo **) &_xfconf_client_method_info_is_property_locked_IN_ARG_pointers,
- (GDBusArgInfo **) &_xfconf_client_method_info_is_property_locked_OUT_ARG_pointers,
- (GDBusAnnotationInfo **) &_xfconf_client_method_is_property_locked_annotation_info_pointers
- },
- "handle-is-property-locked",
- FALSE
-};
-
-static const _ExtendedGDBusMethodInfo * const _xfconf_client_method_info_pointers[] =
-{
- &_xfconf_client_method_info_set_property,
- &_xfconf_client_method_info_get_property,
- &_xfconf_client_method_info_get_all_properties,
- &_xfconf_client_method_info_property_exists,
- &_xfconf_client_method_info_reset_property,
- &_xfconf_client_method_info_list_channels,
- &_xfconf_client_method_info_is_property_locked,
- NULL
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_signal_info_property_changed_ARG_channel =
-{
- {
- -1,
- (gchar *) "channel",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_signal_info_property_changed_ARG_property =
-{
- {
- -1,
- (gchar *) "property",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_signal_info_property_changed_ARG_value =
-{
- {
- -1,
- (gchar *) "value",
- (gchar *) "v",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_signal_info_property_changed_ARG_pointers[] =
-{
- &_xfconf_client_signal_info_property_changed_ARG_channel,
- &_xfconf_client_signal_info_property_changed_ARG_property,
- &_xfconf_client_signal_info_property_changed_ARG_value,
- NULL
-};
-
-static const _ExtendedGDBusSignalInfo _xfconf_client_signal_info_property_changed =
-{
- {
- -1,
- (gchar *) "PropertyChanged",
- (GDBusArgInfo **) &_xfconf_client_signal_info_property_changed_ARG_pointers,
- NULL
- },
- "property-changed"
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_signal_info_property_removed_ARG_channel =
-{
- {
- -1,
- (gchar *) "channel",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _xfconf_client_signal_info_property_removed_ARG_property =
-{
- {
- -1,
- (gchar *) "property",
- (gchar *) "s",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _xfconf_client_signal_info_property_removed_ARG_pointers[] =
-{
- &_xfconf_client_signal_info_property_removed_ARG_channel,
- &_xfconf_client_signal_info_property_removed_ARG_property,
- NULL
-};
-
-static const _ExtendedGDBusSignalInfo _xfconf_client_signal_info_property_removed =
-{
- {
- -1,
- (gchar *) "PropertyRemoved",
- (GDBusArgInfo **) &_xfconf_client_signal_info_property_removed_ARG_pointers,
- NULL
- },
- "property-removed"
-};
-
-static const _ExtendedGDBusSignalInfo * const _xfconf_client_signal_info_pointers[] =
-{
- &_xfconf_client_signal_info_property_changed,
- &_xfconf_client_signal_info_property_removed,
- NULL
-};
-
-static const GDBusAnnotationInfo _xfconf_client_annotation_info_0 =
-{
- -1,
- (gchar *) "org.freedesktop.DBus.GLib.CSymbol",
- (gchar *) "xfconf",
- NULL
-};
-
-static const GDBusAnnotationInfo _xfconf_client_annotation_info_1 =
-{
- -1,
- (gchar *) "org.freedesktop.DBus.GLib.ClientCSymbol",
- (gchar *) "xfconf_client",
- NULL
-};
-
-static const GDBusAnnotationInfo * const _xfconf_client_annotation_info_pointers[] =
-{
- &_xfconf_client_annotation_info_0,
- &_xfconf_client_annotation_info_1,
- NULL
-};
-
-static const _ExtendedGDBusInterfaceInfo _xfconf_client_interface_info =
-{
- {
- -1,
- (gchar *) "org.xfce.Xfconf",
- (GDBusMethodInfo **) &_xfconf_client_method_info_pointers,
- (GDBusSignalInfo **) &_xfconf_client_signal_info_pointers,
- NULL,
- (GDBusAnnotationInfo **) &_xfconf_client_annotation_info_pointers
- },
- "client",
-};
-
-
-/**
- * xfconf_client_interface_info:
- *
- * Gets a machine-readable description of the <link linkend="gdbus-interface-org-xfce-Xfconf.top_of_page">org.xfce.Xfconf</link> D-Bus interface.
- *
- * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
- */
-GDBusInterfaceInfo *
-xfconf_client_interface_info (void)
-{
- return (GDBusInterfaceInfo *) &_xfconf_client_interface_info.parent_struct;
-}
-
-/**
- * xfconf_client_override_properties:
- * @klass: The class structure for a #GObject<!-- -->-derived class.
- * @property_id_begin: The property id to assign to the first overridden property.
- *
- * Overrides all #GObject properties in the #XfconfClient interface for a concrete class.
- * The properties are overridden in the order they are defined.
- *
- * Returns: The last property id.
- */
-guint
-xfconf_client_override_properties (GObjectClass *klass, guint property_id_begin)
-{
- return property_id_begin - 1;
-}
-
-
-
-/**
- * XfconfClient:
- *
- * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-xfce-Xfconf.top_of_page">org.xfce.Xfconf</link>.
- */
-
-/**
- * XfconfClientIface:
- * @parent_iface: The parent interface.
- * @handle_get_all_properties: Handler for the #XfconfClient::handle-get-all-properties signal.
- * @handle_get_property: Handler for the #XfconfClient::handle-get-property signal.
- * @handle_is_property_locked: Handler for the #XfconfClient::handle-is-property-locked signal.
- * @handle_list_channels: Handler for the #XfconfClient::handle-list-channels signal.
- * @handle_property_exists: Handler for the #XfconfClient::handle-property-exists signal.
- * @handle_reset_property: Handler for the #XfconfClient::handle-reset-property signal.
- * @handle_set_property: Handler for the #XfconfClient::handle-set-property signal.
- * @property_changed: Handler for the #XfconfClient::property-changed signal.
- * @property_removed: Handler for the #XfconfClient::property-removed signal.
- *
- * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-xfce-Xfconf.top_of_page">org.xfce.Xfconf</link>.
- */
-
-typedef XfconfClientIface XfconfClientInterface;
-G_DEFINE_INTERFACE (XfconfClient, xfconf_client, G_TYPE_OBJECT);
-
-static void
-xfconf_client_default_init (XfconfClientIface *iface)
-{
- /* GObject signals for incoming D-Bus method calls: */
- /**
- * XfconfClient::handle-set-property:
- * @object: A #XfconfClient.
- * @invocation: A #GDBusMethodInvocation.
- * @arg_channel: Argument passed by remote caller.
- * @arg_property: Argument passed by remote caller.
- * @arg_value: Argument passed by remote caller.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-xfce-Xfconf.SetProperty">SetProperty()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call xfconf_client_complete_set_property() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-set-property",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfconfClientIface, handle_set_property),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 4,
- G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_VARIANT);
-
- /**
- * XfconfClient::handle-get-property:
- * @object: A #XfconfClient.
- * @invocation: A #GDBusMethodInvocation.
- * @arg_channel: Argument passed by remote caller.
- * @arg_property: Argument passed by remote caller.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-xfce-Xfconf.GetProperty">GetProperty()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call xfconf_client_complete_get_property() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-get-property",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfconfClientIface, handle_get_property),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 3,
- G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING);
-
- /**
- * XfconfClient::handle-get-all-properties:
- * @object: A #XfconfClient.
- * @invocation: A #GDBusMethodInvocation.
- * @arg_channel: Argument passed by remote caller.
- * @arg_property_base: Argument passed by remote caller.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-xfce-Xfconf.GetAllProperties">GetAllProperties()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call xfconf_client_complete_get_all_properties() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-get-all-properties",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfconfClientIface, handle_get_all_properties),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 3,
- G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING);
-
- /**
- * XfconfClient::handle-property-exists:
- * @object: A #XfconfClient.
- * @invocation: A #GDBusMethodInvocation.
- * @arg_channel: Argument passed by remote caller.
- * @arg_property: Argument passed by remote caller.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-xfce-Xfconf.PropertyExists">PropertyExists()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call xfconf_client_complete_property_exists() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-property-exists",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfconfClientIface, handle_property_exists),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 3,
- G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING);
-
- /**
- * XfconfClient::handle-reset-property:
- * @object: A #XfconfClient.
- * @invocation: A #GDBusMethodInvocation.
- * @arg_channel: Argument passed by remote caller.
- * @arg_property: Argument passed by remote caller.
- * @arg_recursive: Argument passed by remote caller.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-xfce-Xfconf.ResetProperty">ResetProperty()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call xfconf_client_complete_reset_property() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-reset-property",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfconfClientIface, handle_reset_property),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 4,
- G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
- /**
- * XfconfClient::handle-list-channels:
- * @object: A #XfconfClient.
- * @invocation: A #GDBusMethodInvocation.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-xfce-Xfconf.ListChannels">ListChannels()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call xfconf_client_complete_list_channels() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-list-channels",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfconfClientIface, handle_list_channels),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 1,
- G_TYPE_DBUS_METHOD_INVOCATION);
-
- /**
- * XfconfClient::handle-is-property-locked:
- * @object: A #XfconfClient.
- * @invocation: A #GDBusMethodInvocation.
- * @arg_channel: Argument passed by remote caller.
- * @arg_property: Argument passed by remote caller.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-xfce-Xfconf.IsPropertyLocked">IsPropertyLocked()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call xfconf_client_complete_is_property_locked() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-is-property-locked",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfconfClientIface, handle_is_property_locked),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 3,
- G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING);
-
- /* GObject signals for received D-Bus signals: */
- /**
- * XfconfClient::property-changed:
- * @object: A #XfconfClient.
- * @arg_channel: Argument.
- * @arg_property: Argument.
- * @arg_value: Argument.
- *
- * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-xfce-Xfconf.PropertyChanged">"PropertyChanged"</link> is received.
- *
- * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
- */
- g_signal_new ("property-changed",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfconfClientIface, property_changed),
- NULL,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_NONE,
- 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_VARIANT);
-
- /**
- * XfconfClient::property-removed:
- * @object: A #XfconfClient.
- * @arg_channel: Argument.
- * @arg_property: Argument.
- *
- * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-xfce-Xfconf.PropertyRemoved">"PropertyRemoved"</link> is received.
- *
- * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
- */
- g_signal_new ("property-removed",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (XfconfClientIface, property_removed),
- NULL,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_NONE,
- 2, G_TYPE_STRING, G_TYPE_STRING);
-
-}
-
-/**
- * xfconf_client_emit_property_changed:
- * @object: A #XfconfClient.
- * @arg_channel: Argument to pass with the signal.
- * @arg_property: Argument to pass with the signal.
- * @arg_value: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-xfce-Xfconf.PropertyChanged">"PropertyChanged"</link> D-Bus signal.
- */
-void
-xfconf_client_emit_property_changed (
- XfconfClient *object,
- const gchar *arg_channel,
- const gchar *arg_property,
- GVariant *arg_value)
-{
- g_signal_emit_by_name (object, "property-changed", arg_channel, arg_property, arg_value);
-}
-
-/**
- * xfconf_client_emit_property_removed:
- * @object: A #XfconfClient.
- * @arg_channel: Argument to pass with the signal.
- * @arg_property: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-xfce-Xfconf.PropertyRemoved">"PropertyRemoved"</link> D-Bus signal.
- */
-void
-xfconf_client_emit_property_removed (
- XfconfClient *object,
- const gchar *arg_channel,
- const gchar *arg_property)
-{
- g_signal_emit_by_name (object, "property-removed", arg_channel, arg_property);
-}
-
-/**
- * xfconf_client_call_set_property:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property: Argument to pass with the method invocation.
- * @arg_value: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.SetProperty">SetProperty()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call xfconf_client_call_set_property_finish() to get the result of the operation.
- *
- * See xfconf_client_call_set_property_sync() for the synchronous, blocking version of this method.
- */
-void
-xfconf_client_call_set_property (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GVariant *arg_value,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "SetProperty",
- g_variant_new ("(ss at v)",
- arg_channel,
- arg_property,
- arg_value),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * xfconf_client_call_set_property_finish:
- * @proxy: A #XfconfClientProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to xfconf_client_call_set_property().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with xfconf_client_call_set_property().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_set_property_finish (
- XfconfClient *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_set_property_sync:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property: Argument to pass with the method invocation.
- * @arg_value: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.SetProperty">SetProperty()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See xfconf_client_call_set_property() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_set_property_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GVariant *arg_value,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "SetProperty",
- g_variant_new ("(ss at v)",
- arg_channel,
- arg_property,
- arg_value),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_get_property:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.GetProperty">GetProperty()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call xfconf_client_call_get_property_finish() to get the result of the operation.
- *
- * See xfconf_client_call_get_property_sync() for the synchronous, blocking version of this method.
- */
-void
-xfconf_client_call_get_property (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "GetProperty",
- g_variant_new ("(ss)",
- arg_channel,
- arg_property),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * xfconf_client_call_get_property_finish:
- * @proxy: A #XfconfClientProxy.
- * @out_value: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to xfconf_client_call_get_property().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with xfconf_client_call_get_property().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_get_property_finish (
- XfconfClient *proxy,
- GVariant **out_value,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "(@v)",
- out_value);
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_get_property_sync:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property: Argument to pass with the method invocation.
- * @out_value: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.GetProperty">GetProperty()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See xfconf_client_call_get_property() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_get_property_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GVariant **out_value,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "GetProperty",
- g_variant_new ("(ss)",
- arg_channel,
- arg_property),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "(@v)",
- out_value);
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_get_all_properties:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property_base: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.GetAllProperties">GetAllProperties()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call xfconf_client_call_get_all_properties_finish() to get the result of the operation.
- *
- * See xfconf_client_call_get_all_properties_sync() for the synchronous, blocking version of this method.
- */
-void
-xfconf_client_call_get_all_properties (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property_base,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "GetAllProperties",
- g_variant_new ("(ss)",
- arg_channel,
- arg_property_base),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * xfconf_client_call_get_all_properties_finish:
- * @proxy: A #XfconfClientProxy.
- * @out_properties: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to xfconf_client_call_get_all_properties().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with xfconf_client_call_get_all_properties().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_get_all_properties_finish (
- XfconfClient *proxy,
- GVariant **out_properties,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "(@a{sv})",
- out_properties);
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_get_all_properties_sync:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property_base: Argument to pass with the method invocation.
- * @out_properties: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.GetAllProperties">GetAllProperties()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See xfconf_client_call_get_all_properties() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_get_all_properties_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property_base,
- GVariant **out_properties,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "GetAllProperties",
- g_variant_new ("(ss)",
- arg_channel,
- arg_property_base),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "(@a{sv})",
- out_properties);
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_property_exists:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.PropertyExists">PropertyExists()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call xfconf_client_call_property_exists_finish() to get the result of the operation.
- *
- * See xfconf_client_call_property_exists_sync() for the synchronous, blocking version of this method.
- */
-void
-xfconf_client_call_property_exists (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "PropertyExists",
- g_variant_new ("(ss)",
- arg_channel,
- arg_property),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * xfconf_client_call_property_exists_finish:
- * @proxy: A #XfconfClientProxy.
- * @out_exists: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to xfconf_client_call_property_exists().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with xfconf_client_call_property_exists().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_property_exists_finish (
- XfconfClient *proxy,
- gboolean *out_exists,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "(b)",
- out_exists);
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_property_exists_sync:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property: Argument to pass with the method invocation.
- * @out_exists: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.PropertyExists">PropertyExists()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See xfconf_client_call_property_exists() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_property_exists_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- gboolean *out_exists,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "PropertyExists",
- g_variant_new ("(ss)",
- arg_channel,
- arg_property),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "(b)",
- out_exists);
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_reset_property:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property: Argument to pass with the method invocation.
- * @arg_recursive: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.ResetProperty">ResetProperty()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call xfconf_client_call_reset_property_finish() to get the result of the operation.
- *
- * See xfconf_client_call_reset_property_sync() for the synchronous, blocking version of this method.
- */
-void
-xfconf_client_call_reset_property (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- gboolean arg_recursive,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "ResetProperty",
- g_variant_new ("(ssb)",
- arg_channel,
- arg_property,
- arg_recursive),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * xfconf_client_call_reset_property_finish:
- * @proxy: A #XfconfClientProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to xfconf_client_call_reset_property().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with xfconf_client_call_reset_property().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_reset_property_finish (
- XfconfClient *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_reset_property_sync:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property: Argument to pass with the method invocation.
- * @arg_recursive: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.ResetProperty">ResetProperty()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See xfconf_client_call_reset_property() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_reset_property_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- gboolean arg_recursive,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "ResetProperty",
- g_variant_new ("(ssb)",
- arg_channel,
- arg_property,
- arg_recursive),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_list_channels:
- * @proxy: A #XfconfClientProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.ListChannels">ListChannels()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call xfconf_client_call_list_channels_finish() to get the result of the operation.
- *
- * See xfconf_client_call_list_channels_sync() for the synchronous, blocking version of this method.
- */
-void
-xfconf_client_call_list_channels (
- XfconfClient *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "ListChannels",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * xfconf_client_call_list_channels_finish:
- * @proxy: A #XfconfClientProxy.
- * @out_channels: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to xfconf_client_call_list_channels().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with xfconf_client_call_list_channels().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_list_channels_finish (
- XfconfClient *proxy,
- gchar ***out_channels,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "(^as)",
- out_channels);
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_list_channels_sync:
- * @proxy: A #XfconfClientProxy.
- * @out_channels: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.ListChannels">ListChannels()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See xfconf_client_call_list_channels() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_list_channels_sync (
- XfconfClient *proxy,
- gchar ***out_channels,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "ListChannels",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "(^as)",
- out_channels);
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_is_property_locked:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.IsPropertyLocked">IsPropertyLocked()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call xfconf_client_call_is_property_locked_finish() to get the result of the operation.
- *
- * See xfconf_client_call_is_property_locked_sync() for the synchronous, blocking version of this method.
- */
-void
-xfconf_client_call_is_property_locked (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "IsPropertyLocked",
- g_variant_new ("(ss)",
- arg_channel,
- arg_property),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * xfconf_client_call_is_property_locked_finish:
- * @proxy: A #XfconfClientProxy.
- * @out_locked: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to xfconf_client_call_is_property_locked().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with xfconf_client_call_is_property_locked().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_is_property_locked_finish (
- XfconfClient *proxy,
- gboolean *out_locked,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "(b)",
- out_locked);
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_call_is_property_locked_sync:
- * @proxy: A #XfconfClientProxy.
- * @arg_channel: Argument to pass with the method invocation.
- * @arg_property: Argument to pass with the method invocation.
- * @out_locked: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-xfce-Xfconf.IsPropertyLocked">IsPropertyLocked()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See xfconf_client_call_is_property_locked() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-xfconf_client_call_is_property_locked_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- gboolean *out_locked,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "IsPropertyLocked",
- g_variant_new ("(ss)",
- arg_channel,
- arg_property),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "(b)",
- out_locked);
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * xfconf_client_complete_set_property:
- * @object: A #XfconfClient.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-xfce-Xfconf.SetProperty">SetProperty()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-xfconf_client_complete_set_property (
- XfconfClient *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/**
- * xfconf_client_complete_get_property:
- * @object: A #XfconfClient.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- * @value: Parameter to return.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-xfce-Xfconf.GetProperty">GetProperty()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-xfconf_client_complete_get_property (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- GVariant *value)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("(@v)",
- value));
-}
-
-/**
- * xfconf_client_complete_get_all_properties:
- * @object: A #XfconfClient.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- * @properties: Parameter to return.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-xfce-Xfconf.GetAllProperties">GetAllProperties()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-xfconf_client_complete_get_all_properties (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- GVariant *properties)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("(@a{sv})",
- properties));
-}
-
-/**
- * xfconf_client_complete_property_exists:
- * @object: A #XfconfClient.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- * @exists: Parameter to return.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-xfce-Xfconf.PropertyExists">PropertyExists()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-xfconf_client_complete_property_exists (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- gboolean exists)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("(b)",
- exists));
-}
-
-/**
- * xfconf_client_complete_reset_property:
- * @object: A #XfconfClient.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-xfce-Xfconf.ResetProperty">ResetProperty()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-xfconf_client_complete_reset_property (
- XfconfClient *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/**
- * xfconf_client_complete_list_channels:
- * @object: A #XfconfClient.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- * @channels: Parameter to return.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-xfce-Xfconf.ListChannels">ListChannels()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-xfconf_client_complete_list_channels (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- const gchar *const *channels)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("(^as)",
- channels));
-}
-
-/**
- * xfconf_client_complete_is_property_locked:
- * @object: A #XfconfClient.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- * @locked: Parameter to return.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-xfce-Xfconf.IsPropertyLocked">IsPropertyLocked()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-xfconf_client_complete_is_property_locked (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- gboolean locked)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("(b)",
- locked));
-}
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * XfconfClientProxy:
- *
- * The #XfconfClientProxy structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * XfconfClientProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #XfconfClientProxy.
- */
-
-struct _XfconfClientProxyPrivate
-{
- GData *qdata;
-};
-
-static void xfconf_client_proxy_iface_init (XfconfClientIface *iface);
-
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (XfconfClientProxy, xfconf_client_proxy, G_TYPE_DBUS_PROXY,
- G_ADD_PRIVATE (XfconfClientProxy)
- G_IMPLEMENT_INTERFACE (XFCONF_TYPE_CLIENT, xfconf_client_proxy_iface_init));
-
-#else
-G_DEFINE_TYPE_WITH_CODE (XfconfClientProxy, xfconf_client_proxy, G_TYPE_DBUS_PROXY,
- G_IMPLEMENT_INTERFACE (XFCONF_TYPE_CLIENT, xfconf_client_proxy_iface_init));
-
-#endif
-static void
-xfconf_client_proxy_finalize (GObject *object)
-{
- XfconfClientProxy *proxy = XFCONF_CLIENT_PROXY (object);
- g_datalist_clear (&proxy->priv->qdata);
- G_OBJECT_CLASS (xfconf_client_proxy_parent_class)->finalize (object);
-}
-
-static void
-xfconf_client_proxy_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec G_GNUC_UNUSED)
-{
-}
-
-static void
-xfconf_client_proxy_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec G_GNUC_UNUSED)
-{
-}
-
-static void
-xfconf_client_proxy_g_signal (GDBusProxy *proxy,
- const gchar *sender_name G_GNUC_UNUSED,
- const gchar *signal_name,
- GVariant *parameters)
-{
- _ExtendedGDBusSignalInfo *info;
- GVariantIter iter;
- GVariant *child;
- GValue *paramv;
- guint num_params;
- guint n;
- guint signal_id;
- info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_xfconf_client_interface_info.parent_struct, signal_name);
- if (info == NULL)
- return;
- num_params = g_variant_n_children (parameters);
- paramv = g_new0 (GValue, num_params + 1);
- g_value_init (¶mv[0], XFCONF_TYPE_CLIENT);
- g_value_set_object (¶mv[0], proxy);
- g_variant_iter_init (&iter, parameters);
- n = 1;
- while ((child = g_variant_iter_next_value (&iter)) != NULL)
- {
- _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];
- if (arg_info->use_gvariant)
- {
- g_value_init (¶mv[n], G_TYPE_VARIANT);
- g_value_set_variant (¶mv[n], child);
- n++;
- }
- else
- g_dbus_gvariant_to_gvalue (child, ¶mv[n++]);
- g_variant_unref (child);
- }
- signal_id = g_signal_lookup (info->signal_name, XFCONF_TYPE_CLIENT);
- g_signal_emitv (paramv, signal_id, 0, NULL);
- for (n = 0; n < num_params + 1; n++)
- g_value_unset (¶mv[n]);
- g_free (paramv);
-}
-
-static void
-xfconf_client_proxy_g_properties_changed (GDBusProxy *_proxy,
- GVariant *changed_properties,
- const gchar *const *invalidated_properties)
-{
- XfconfClientProxy *proxy = XFCONF_CLIENT_PROXY (_proxy);
- guint n;
- const gchar *key;
- GVariantIter *iter;
- _ExtendedGDBusPropertyInfo *info;
- g_variant_get (changed_properties, "a{sv}", &iter);
- while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
- {
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_xfconf_client_interface_info.parent_struct, key);
- g_datalist_remove_data (&proxy->priv->qdata, key);
- if (info != NULL)
- g_object_notify (G_OBJECT (proxy), info->hyphen_name);
- }
- g_variant_iter_free (iter);
- for (n = 0; invalidated_properties[n] != NULL; n++)
- {
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_xfconf_client_interface_info.parent_struct, invalidated_properties[n]);
- g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
- if (info != NULL)
- g_object_notify (G_OBJECT (proxy), info->hyphen_name);
- }
-}
-
-static void
-xfconf_client_proxy_init (XfconfClientProxy *proxy)
-{
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
- proxy->priv = xfconf_client_proxy_get_instance_private (proxy);
-#else
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, XFCONF_TYPE_CLIENT_PROXY, XfconfClientProxyPrivate);
-#endif
-
- g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), xfconf_client_interface_info ());
-}
-
-static void
-xfconf_client_proxy_class_init (XfconfClientProxyClass *klass)
-{
- GObjectClass *gobject_class;
- GDBusProxyClass *proxy_class;
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = xfconf_client_proxy_finalize;
- gobject_class->get_property = xfconf_client_proxy_get_property;
- gobject_class->set_property = xfconf_client_proxy_set_property;
-
- proxy_class = G_DBUS_PROXY_CLASS (klass);
- proxy_class->g_signal = xfconf_client_proxy_g_signal;
- proxy_class->g_properties_changed = xfconf_client_proxy_g_properties_changed;
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
- g_type_class_add_private (klass, sizeof (XfconfClientProxyPrivate));
-#endif
-}
-
-static void
-xfconf_client_proxy_iface_init (XfconfClientIface *iface)
-{
-}
-
-/**
- * xfconf_client_proxy_new:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-xfce-Xfconf.top_of_page">org.xfce.Xfconf</link>. See g_dbus_proxy_new() for more details.
- *
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call xfconf_client_proxy_new_finish() to get the result of the operation.
- *
- * See xfconf_client_proxy_new_sync() for the synchronous, blocking version of this constructor.
- */
-void
-xfconf_client_proxy_new (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_async_initable_new_async (XFCONF_TYPE_CLIENT_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.xfce.Xfconf", NULL);
-}
-
-/**
- * xfconf_client_proxy_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to xfconf_client_proxy_new().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with xfconf_client_proxy_new().
- *
- * Returns: (transfer full) (type XfconfClientProxy): The constructed proxy object or %NULL if @error is set.
- */
-XfconfClient *
-xfconf_client_proxy_new_finish (
- GAsyncResult *res,
- GError **error)
-{
- GObject *ret;
- GObject *source_object;
- source_object = g_async_result_get_source_object (res);
- ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
- g_object_unref (source_object);
- if (ret != NULL)
- return XFCONF_CLIENT (ret);
- else
- return NULL;
-}
-
-/**
- * xfconf_client_proxy_new_sync:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Synchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-xfce-Xfconf.top_of_page">org.xfce.Xfconf</link>. See g_dbus_proxy_new_sync() for more details.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See xfconf_client_proxy_new() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type XfconfClientProxy): The constructed proxy object or %NULL if @error is set.
- */
-XfconfClient *
-xfconf_client_proxy_new_sync (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error)
-{
- GInitable *ret;
- ret = g_initable_new (XFCONF_TYPE_CLIENT_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.xfce.Xfconf", NULL);
- if (ret != NULL)
- return XFCONF_CLIENT (ret);
- else
- return NULL;
-}
-
-
-/**
- * xfconf_client_proxy_new_for_bus:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Like xfconf_client_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
- *
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call xfconf_client_proxy_new_for_bus_finish() to get the result of the operation.
- *
- * See xfconf_client_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
- */
-void
-xfconf_client_proxy_new_for_bus (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_async_initable_new_async (XFCONF_TYPE_CLIENT_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.xfce.Xfconf", NULL);
-}
-
-/**
- * xfconf_client_proxy_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to xfconf_client_proxy_new_for_bus().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with xfconf_client_proxy_new_for_bus().
- *
- * Returns: (transfer full) (type XfconfClientProxy): The constructed proxy object or %NULL if @error is set.
- */
-XfconfClient *
-xfconf_client_proxy_new_for_bus_finish (
- GAsyncResult *res,
- GError **error)
-{
- GObject *ret;
- GObject *source_object;
- source_object = g_async_result_get_source_object (res);
- ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
- g_object_unref (source_object);
- if (ret != NULL)
- return XFCONF_CLIENT (ret);
- else
- return NULL;
-}
-
-/**
- * xfconf_client_proxy_new_for_bus_sync:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Like xfconf_client_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See xfconf_client_proxy_new_for_bus() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type XfconfClientProxy): The constructed proxy object or %NULL if @error is set.
- */
-XfconfClient *
-xfconf_client_proxy_new_for_bus_sync (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error)
-{
- GInitable *ret;
- ret = g_initable_new (XFCONF_TYPE_CLIENT_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.xfce.Xfconf", NULL);
- if (ret != NULL)
- return XFCONF_CLIENT (ret);
- else
- return NULL;
-}
-
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * XfconfClientSkeleton:
- *
- * The #XfconfClientSkeleton structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * XfconfClientSkeletonClass:
- * @parent_class: The parent class.
- *
- * Class structure for #XfconfClientSkeleton.
- */
-
-struct _XfconfClientSkeletonPrivate
-{
- GValue *properties;
- GList *changed_properties;
- GSource *changed_properties_idle_source;
- GMainContext *context;
- GMutex lock;
-};
-
-static void
-_xfconf_client_skeleton_handle_method_call (
- GDBusConnection *connection G_GNUC_UNUSED,
- const gchar *sender G_GNUC_UNUSED,
- const gchar *object_path G_GNUC_UNUSED,
- const gchar *interface_name,
- const gchar *method_name,
- GVariant *parameters,
- GDBusMethodInvocation *invocation,
- gpointer user_data)
-{
- XfconfClientSkeleton *skeleton = XFCONF_CLIENT_SKELETON (user_data);
- _ExtendedGDBusMethodInfo *info;
- GVariantIter iter;
- GVariant *child;
- GValue *paramv;
- guint num_params;
- guint num_extra;
- guint n;
- guint signal_id;
- GValue return_value = G_VALUE_INIT;
- info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
- g_assert (info != NULL);
- num_params = g_variant_n_children (parameters);
- num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra);
- n = 0;
- g_value_init (¶mv[n], XFCONF_TYPE_CLIENT);
- g_value_set_object (¶mv[n++], skeleton);
- g_value_init (¶mv[n], G_TYPE_DBUS_METHOD_INVOCATION);
- g_value_set_object (¶mv[n++], invocation);
- if (info->pass_fdlist)
- {
-#ifdef G_OS_UNIX
- g_value_init (¶mv[n], G_TYPE_UNIX_FD_LIST);
- g_value_set_object (¶mv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));
-#else
- g_assert_not_reached ();
-#endif
- }
- g_variant_iter_init (&iter, parameters);
- while ((child = g_variant_iter_next_value (&iter)) != NULL)
- {
- _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra];
- if (arg_info->use_gvariant)
- {
- g_value_init (¶mv[n], G_TYPE_VARIANT);
- g_value_set_variant (¶mv[n], child);
- n++;
- }
- else
- g_dbus_gvariant_to_gvalue (child, ¶mv[n++]);
- g_variant_unref (child);
- }
- signal_id = g_signal_lookup (info->signal_name, XFCONF_TYPE_CLIENT);
- g_value_init (&return_value, G_TYPE_BOOLEAN);
- g_signal_emitv (paramv, signal_id, 0, &return_value);
- if (!g_value_get_boolean (&return_value))
- g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);
- g_value_unset (&return_value);
- for (n = 0; n < num_params + num_extra; n++)
- g_value_unset (¶mv[n]);
- g_free (paramv);
-}
-
-static GVariant *
-_xfconf_client_skeleton_handle_get_property (
- GDBusConnection *connection G_GNUC_UNUSED,
- const gchar *sender G_GNUC_UNUSED,
- const gchar *object_path G_GNUC_UNUSED,
- const gchar *interface_name G_GNUC_UNUSED,
- const gchar *property_name,
- GError **error,
- gpointer user_data)
-{
- XfconfClientSkeleton *skeleton = XFCONF_CLIENT_SKELETON (user_data);
- GValue value = G_VALUE_INIT;
- GParamSpec *pspec;
- _ExtendedGDBusPropertyInfo *info;
- GVariant *ret;
- ret = NULL;
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_xfconf_client_interface_info.parent_struct, property_name);
- g_assert (info != NULL);
- pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
- if (pspec == NULL)
- {
- g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
- }
- else
- {
- g_value_init (&value, pspec->value_type);
- g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);
- ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));
- g_value_unset (&value);
- }
- return ret;
-}
-
-static gboolean
-_xfconf_client_skeleton_handle_set_property (
- GDBusConnection *connection G_GNUC_UNUSED,
- const gchar *sender G_GNUC_UNUSED,
- const gchar *object_path G_GNUC_UNUSED,
- const gchar *interface_name G_GNUC_UNUSED,
- const gchar *property_name,
- GVariant *variant,
- GError **error,
- gpointer user_data)
-{
- XfconfClientSkeleton *skeleton = XFCONF_CLIENT_SKELETON (user_data);
- GValue value = G_VALUE_INIT;
- GParamSpec *pspec;
- _ExtendedGDBusPropertyInfo *info;
- gboolean ret;
- ret = FALSE;
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_xfconf_client_interface_info.parent_struct, property_name);
- g_assert (info != NULL);
- pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
- if (pspec == NULL)
- {
- g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
- }
- else
- {
- if (info->use_gvariant)
- g_value_set_variant (&value, variant);
- else
- g_dbus_gvariant_to_gvalue (variant, &value);
- g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);
- g_value_unset (&value);
- ret = TRUE;
- }
- return ret;
-}
-
-static const GDBusInterfaceVTable _xfconf_client_skeleton_vtable =
-{
- _xfconf_client_skeleton_handle_method_call,
- _xfconf_client_skeleton_handle_get_property,
- _xfconf_client_skeleton_handle_set_property,
- {NULL}
-};
-
-static GDBusInterfaceInfo *
-xfconf_client_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
-{
- return xfconf_client_interface_info ();
-}
-
-static GDBusInterfaceVTable *
-xfconf_client_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
-{
- return (GDBusInterfaceVTable *) &_xfconf_client_skeleton_vtable;
-}
-
-static GVariant *
-xfconf_client_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
-{
- XfconfClientSkeleton *skeleton = XFCONF_CLIENT_SKELETON (_skeleton);
-
- GVariantBuilder builder;
- guint n;
- g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
- if (_xfconf_client_interface_info.parent_struct.properties == NULL)
- goto out;
- for (n = 0; _xfconf_client_interface_info.parent_struct.properties[n] != NULL; n++)
- {
- GDBusPropertyInfo *info = _xfconf_client_interface_info.parent_struct.properties[n];
- if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
- {
- GVariant *value;
- value = _xfconf_client_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.xfce.Xfconf", info->name, NULL, skeleton);
- if (value != NULL)
- {
- g_variant_take_ref (value);
- g_variant_builder_add (&builder, "{sv}", info->name, value);
- g_variant_unref (value);
- }
- }
- }
-out:
- return g_variant_builder_end (&builder);
-}
-
-static void
-xfconf_client_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
-{
-}
-
-static void
-_xfconf_client_on_signal_property_changed (
- XfconfClient *object,
- const gchar *arg_channel,
- const gchar *arg_property,
- GVariant *arg_value)
-{
- XfconfClientSkeleton *skeleton = XFCONF_CLIENT_SKELETON (object);
-
- GList *connections, *l;
- GVariant *signal_variant;
- connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
- signal_variant = g_variant_ref_sink (g_variant_new ("(ss at v)",
- arg_channel,
- arg_property,
- arg_value));
- for (l = connections; l != NULL; l = l->next)
- {
- GDBusConnection *connection = l->data;
- g_dbus_connection_emit_signal (connection,
- NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.xfce.Xfconf", "PropertyChanged",
- signal_variant, NULL);
- }
- g_variant_unref (signal_variant);
- g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_xfconf_client_on_signal_property_removed (
- XfconfClient *object,
- const gchar *arg_channel,
- const gchar *arg_property)
-{
- XfconfClientSkeleton *skeleton = XFCONF_CLIENT_SKELETON (object);
-
- GList *connections, *l;
- GVariant *signal_variant;
- connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
- signal_variant = g_variant_ref_sink (g_variant_new ("(ss)",
- arg_channel,
- arg_property));
- for (l = connections; l != NULL; l = l->next)
- {
- GDBusConnection *connection = l->data;
- g_dbus_connection_emit_signal (connection,
- NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.xfce.Xfconf", "PropertyRemoved",
- signal_variant, NULL);
- }
- g_variant_unref (signal_variant);
- g_list_free_full (connections, g_object_unref);
-}
-
-static void xfconf_client_skeleton_iface_init (XfconfClientIface *iface);
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (XfconfClientSkeleton, xfconf_client_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
- G_ADD_PRIVATE (XfconfClientSkeleton)
- G_IMPLEMENT_INTERFACE (XFCONF_TYPE_CLIENT, xfconf_client_skeleton_iface_init));
-
-#else
-G_DEFINE_TYPE_WITH_CODE (XfconfClientSkeleton, xfconf_client_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
- G_IMPLEMENT_INTERFACE (XFCONF_TYPE_CLIENT, xfconf_client_skeleton_iface_init));
-
-#endif
-static void
-xfconf_client_skeleton_finalize (GObject *object)
-{
- XfconfClientSkeleton *skeleton = XFCONF_CLIENT_SKELETON (object);
- g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
- if (skeleton->priv->changed_properties_idle_source != NULL)
- g_source_destroy (skeleton->priv->changed_properties_idle_source);
- g_main_context_unref (skeleton->priv->context);
- g_mutex_clear (&skeleton->priv->lock);
- G_OBJECT_CLASS (xfconf_client_skeleton_parent_class)->finalize (object);
-}
-
-static void
-xfconf_client_skeleton_init (XfconfClientSkeleton *skeleton)
-{
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
- skeleton->priv = xfconf_client_skeleton_get_instance_private (skeleton);
-#else
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, XFCONF_TYPE_CLIENT_SKELETON, XfconfClientSkeletonPrivate);
-#endif
-
- g_mutex_init (&skeleton->priv->lock);
- skeleton->priv->context = g_main_context_ref_thread_default ();
-}
-
-static void
-xfconf_client_skeleton_class_init (XfconfClientSkeletonClass *klass)
-{
- GObjectClass *gobject_class;
- GDBusInterfaceSkeletonClass *skeleton_class;
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = xfconf_client_skeleton_finalize;
-
- skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
- skeleton_class->get_info = xfconf_client_skeleton_dbus_interface_get_info;
- skeleton_class->get_properties = xfconf_client_skeleton_dbus_interface_get_properties;
- skeleton_class->flush = xfconf_client_skeleton_dbus_interface_flush;
- skeleton_class->get_vtable = xfconf_client_skeleton_dbus_interface_get_vtable;
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
- g_type_class_add_private (klass, sizeof (XfconfClientSkeletonPrivate));
-#endif
-}
-
-static void
-xfconf_client_skeleton_iface_init (XfconfClientIface *iface)
-{
- iface->property_changed = _xfconf_client_on_signal_property_changed;
- iface->property_removed = _xfconf_client_on_signal_property_removed;
-}
-
-/**
- * xfconf_client_skeleton_new:
- *
- * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-xfce-Xfconf.top_of_page">org.xfce.Xfconf</link>.
- *
- * Returns: (transfer full) (type XfconfClientSkeleton): The skeleton object.
- */
-XfconfClient *
-xfconf_client_skeleton_new (void)
-{
- return XFCONF_CLIENT (g_object_new (XFCONF_TYPE_CLIENT_SKELETON, NULL));
-}
-
diff --git a/common/xfconf-gdbus-bindings.h b/common/xfconf-gdbus-bindings.h
deleted file mode 100644
index 543d369..0000000
--- a/common/xfconf-gdbus-bindings.h
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.48.0. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifndef __XFCONF_GDBUS_BINDINGS_H__
-#define __XFCONF_GDBUS_BINDINGS_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-
-/* ------------------------------------------------------------------------ */
-/* Declarations for org.xfce.Xfconf */
-
-#define XFCONF_TYPE_CLIENT (xfconf_client_get_type ())
-#define XFCONF_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFCONF_TYPE_CLIENT, XfconfClient))
-#define XFCONF_IS_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFCONF_TYPE_CLIENT))
-#define XFCONF_CLIENT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), XFCONF_TYPE_CLIENT, XfconfClientIface))
-
-struct _XfconfClient;
-typedef struct _XfconfClient XfconfClient;
-typedef struct _XfconfClientIface XfconfClientIface;
-
-struct _XfconfClientIface
-{
- GTypeInterface parent_iface;
-
-
- gboolean (*handle_get_all_properties) (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- const gchar *arg_channel,
- const gchar *arg_property_base);
-
- gboolean (*handle_get_property) (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- const gchar *arg_channel,
- const gchar *arg_property);
-
- gboolean (*handle_is_property_locked) (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- const gchar *arg_channel,
- const gchar *arg_property);
-
- gboolean (*handle_list_channels) (
- XfconfClient *object,
- GDBusMethodInvocation *invocation);
-
- gboolean (*handle_property_exists) (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- const gchar *arg_channel,
- const gchar *arg_property);
-
- gboolean (*handle_reset_property) (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- const gchar *arg_channel,
- const gchar *arg_property,
- gboolean arg_recursive);
-
- gboolean (*handle_set_property) (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- const gchar *arg_channel,
- const gchar *arg_property,
- GVariant *arg_value);
-
- void (*property_changed) (
- XfconfClient *object,
- const gchar *arg_channel,
- const gchar *arg_property,
- GVariant *arg_value);
-
- void (*property_removed) (
- XfconfClient *object,
- const gchar *arg_channel,
- const gchar *arg_property);
-
-};
-
-GType xfconf_client_get_type (void) G_GNUC_CONST;
-
-GDBusInterfaceInfo *xfconf_client_interface_info (void);
-guint xfconf_client_override_properties (GObjectClass *klass, guint property_id_begin);
-
-
-/* D-Bus method call completion functions: */
-void xfconf_client_complete_set_property (
- XfconfClient *object,
- GDBusMethodInvocation *invocation);
-
-void xfconf_client_complete_get_property (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- GVariant *value);
-
-void xfconf_client_complete_get_all_properties (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- GVariant *properties);
-
-void xfconf_client_complete_property_exists (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- gboolean exists);
-
-void xfconf_client_complete_reset_property (
- XfconfClient *object,
- GDBusMethodInvocation *invocation);
-
-void xfconf_client_complete_list_channels (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- const gchar *const *channels);
-
-void xfconf_client_complete_is_property_locked (
- XfconfClient *object,
- GDBusMethodInvocation *invocation,
- gboolean locked);
-
-
-
-/* D-Bus signal emissions functions: */
-void xfconf_client_emit_property_changed (
- XfconfClient *object,
- const gchar *arg_channel,
- const gchar *arg_property,
- GVariant *arg_value);
-
-void xfconf_client_emit_property_removed (
- XfconfClient *object,
- const gchar *arg_channel,
- const gchar *arg_property);
-
-
-
-/* D-Bus method calls: */
-void xfconf_client_call_set_property (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GVariant *arg_value,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean xfconf_client_call_set_property_finish (
- XfconfClient *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean xfconf_client_call_set_property_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GVariant *arg_value,
- GCancellable *cancellable,
- GError **error);
-
-void xfconf_client_call_get_property (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean xfconf_client_call_get_property_finish (
- XfconfClient *proxy,
- GVariant **out_value,
- GAsyncResult *res,
- GError **error);
-
-gboolean xfconf_client_call_get_property_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GVariant **out_value,
- GCancellable *cancellable,
- GError **error);
-
-void xfconf_client_call_get_all_properties (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property_base,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean xfconf_client_call_get_all_properties_finish (
- XfconfClient *proxy,
- GVariant **out_properties,
- GAsyncResult *res,
- GError **error);
-
-gboolean xfconf_client_call_get_all_properties_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property_base,
- GVariant **out_properties,
- GCancellable *cancellable,
- GError **error);
-
-void xfconf_client_call_property_exists (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean xfconf_client_call_property_exists_finish (
- XfconfClient *proxy,
- gboolean *out_exists,
- GAsyncResult *res,
- GError **error);
-
-gboolean xfconf_client_call_property_exists_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- gboolean *out_exists,
- GCancellable *cancellable,
- GError **error);
-
-void xfconf_client_call_reset_property (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- gboolean arg_recursive,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean xfconf_client_call_reset_property_finish (
- XfconfClient *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean xfconf_client_call_reset_property_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- gboolean arg_recursive,
- GCancellable *cancellable,
- GError **error);
-
-void xfconf_client_call_list_channels (
- XfconfClient *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean xfconf_client_call_list_channels_finish (
- XfconfClient *proxy,
- gchar ***out_channels,
- GAsyncResult *res,
- GError **error);
-
-gboolean xfconf_client_call_list_channels_sync (
- XfconfClient *proxy,
- gchar ***out_channels,
- GCancellable *cancellable,
- GError **error);
-
-void xfconf_client_call_is_property_locked (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean xfconf_client_call_is_property_locked_finish (
- XfconfClient *proxy,
- gboolean *out_locked,
- GAsyncResult *res,
- GError **error);
-
-gboolean xfconf_client_call_is_property_locked_sync (
- XfconfClient *proxy,
- const gchar *arg_channel,
- const gchar *arg_property,
- gboolean *out_locked,
- GCancellable *cancellable,
- GError **error);
-
-
-
-/* ---- */
-
-#define XFCONF_TYPE_CLIENT_PROXY (xfconf_client_proxy_get_type ())
-#define XFCONF_CLIENT_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFCONF_TYPE_CLIENT_PROXY, XfconfClientProxy))
-#define XFCONF_CLIENT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), XFCONF_TYPE_CLIENT_PROXY, XfconfClientProxyClass))
-#define XFCONF_CLIENT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XFCONF_TYPE_CLIENT_PROXY, XfconfClientProxyClass))
-#define XFCONF_IS_CLIENT_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFCONF_TYPE_CLIENT_PROXY))
-#define XFCONF_IS_CLIENT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XFCONF_TYPE_CLIENT_PROXY))
-
-typedef struct _XfconfClientProxy XfconfClientProxy;
-typedef struct _XfconfClientProxyClass XfconfClientProxyClass;
-typedef struct _XfconfClientProxyPrivate XfconfClientProxyPrivate;
-
-struct _XfconfClientProxy
-{
- /*< private >*/
- GDBusProxy parent_instance;
- XfconfClientProxyPrivate *priv;
-};
-
-struct _XfconfClientProxyClass
-{
- GDBusProxyClass parent_class;
-};
-
-GType xfconf_client_proxy_get_type (void) G_GNUC_CONST;
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (XfconfClientProxy, g_object_unref)
-#endif
-
-void xfconf_client_proxy_new (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-XfconfClient *xfconf_client_proxy_new_finish (
- GAsyncResult *res,
- GError **error);
-XfconfClient *xfconf_client_proxy_new_sync (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error);
-
-void xfconf_client_proxy_new_for_bus (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-XfconfClient *xfconf_client_proxy_new_for_bus_finish (
- GAsyncResult *res,
- GError **error);
-XfconfClient *xfconf_client_proxy_new_for_bus_sync (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error);
-
-
-/* ---- */
-
-#define XFCONF_TYPE_CLIENT_SKELETON (xfconf_client_skeleton_get_type ())
-#define XFCONF_CLIENT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFCONF_TYPE_CLIENT_SKELETON, XfconfClientSkeleton))
-#define XFCONF_CLIENT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), XFCONF_TYPE_CLIENT_SKELETON, XfconfClientSkeletonClass))
-#define XFCONF_CLIENT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XFCONF_TYPE_CLIENT_SKELETON, XfconfClientSkeletonClass))
-#define XFCONF_IS_CLIENT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFCONF_TYPE_CLIENT_SKELETON))
-#define XFCONF_IS_CLIENT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XFCONF_TYPE_CLIENT_SKELETON))
-
-typedef struct _XfconfClientSkeleton XfconfClientSkeleton;
-typedef struct _XfconfClientSkeletonClass XfconfClientSkeletonClass;
-typedef struct _XfconfClientSkeletonPrivate XfconfClientSkeletonPrivate;
-
-struct _XfconfClientSkeleton
-{
- /*< private >*/
- GDBusInterfaceSkeleton parent_instance;
- XfconfClientSkeletonPrivate *priv;
-};
-
-struct _XfconfClientSkeletonClass
-{
- GDBusInterfaceSkeletonClass parent_class;
-};
-
-GType xfconf_client_skeleton_get_type (void) G_GNUC_CONST;
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (XfconfClientSkeleton, g_object_unref)
-#endif
-
-XfconfClient *xfconf_client_skeleton_new (void);
-
-
-G_END_DECLS
-
-#endif /* __XFCONF_GDBUS_BINDINGS_H__ */
diff --git a/configure.ac.in b/configure.ac.in
index 30d7b20..00e1b8d 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -91,8 +91,6 @@ PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.26.0])
PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.26.0])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
-XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
-XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
dnl check for perl bindings for --disable-perl-bindings and make-exo-alias.pl
AC_PATH_PROGS([PERL], [perl5.8 perl5.6 perl5 perl])
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 32b0195..09d1c2c 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -35,10 +35,10 @@ IGNORE_HFILES= \
xfconf-backend-factory.h \
xfconf-backend-perchannel-xml.h \
xfconf-daemon.h \
- xfconf-dbus-bindings.h \
+ xfconf-gdbus-bindings.h \
+ xfconf-gdbus-bindings.c \
xfconf-marshal.h \
- xfconf-private.h \
- xfconfd-dbus-server.h
+ xfconf-private.h
# Extra files to add when scanning (relative to $srcdir)
EXTRA_HFILES=
@@ -57,8 +57,7 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
$(GLIB_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
+ $(GIO_UNIX_CFLAGS) \
$(GTK_DOC_EXTRA_CFLAGS)
GTKDOC_LIBS = \
diff --git a/tests/Makefile.inc b/tests/Makefile.inc
index da1c6b0..36b8cde 100644
--- a/tests/Makefile.inc
+++ b/tests/Makefile.inc
@@ -20,8 +20,8 @@ AM_CFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/tests \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(GIO_UNIX_CFLAGS)
-LIBS = $(DBUS_GLIB_LIBS) \
+LIBS = $(GIO_UNIX_LIBS) \
$(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la
diff --git a/xfconf-query/Makefile.am b/xfconf-query/Makefile.am
index 61f2887..bd2e8c2 100644
--- a/xfconf-query/Makefile.am
+++ b/xfconf-query/Makefile.am
@@ -15,7 +15,7 @@ xfconf_query_SOURCES = \
xfconf_query_CFLAGS = \
$(GLIB_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
+ $(GIO_UNIX_CFLAGS) \
$(PLATFORM_CFLAGS)
xfconf_query_LDFLAGS = \
@@ -26,4 +26,4 @@ xfconf_query_LDADD = \
$(top_builddir)/xfconf/libxfconf-0.la \
$(GLIB_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
- $(DBUS_GLIB_LIBS)
+ $(GIO_UNIX_LIBS)
diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am
index 6983c58..a6900a2 100644
--- a/xfconfd/Makefile.am
+++ b/xfconfd/Makefile.am
@@ -35,8 +35,7 @@ xfconfd_SOURCES = \
xfconfd_CFLAGS = \
$(GLIB_CFLAGS) \
$(GTHREAD_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
+ $(GIO_UNIX_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(PLATFORM_CFLAGS)
@@ -50,10 +49,10 @@ endif
xfconfd_LDADD = \
$(top_builddir)/common/libxfconf-common.la \
$(top_builddir)/common/libxfconf-gvaluefuncs.la \
+ $(top_builddir)/common/libxfconf-dbus.la \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
- $(DBUS_LIBS) \
- $(DBUS_GLIB_LIBS) \
+ $(GIO_UNIX_LIBS) \
$(LIBXFCE4UTIL_LIBS)
servicedir = $(datadir)/dbus-1/services
diff --git a/xfconfd/xfconf-backend-factory.c b/xfconfd/xfconf-backend-factory.c
index 307d7c7..0ec3c43 100644
--- a/xfconfd/xfconf-backend-factory.c
+++ b/xfconfd/xfconf-backend-factory.c
@@ -25,6 +25,7 @@
#include "xfconf-backend-factory.h"
#include "xfconf-backend.h"
+#include "xfconf-daemon.h"
/* i'm not sure i like this method. perhaps each backend could be a
* GTypeModule. i also want the ability to multiplex multiple backends.
diff --git a/xfconfd/xfconf-backend-perchannel-xml.c b/xfconfd/xfconf-backend-perchannel-xml.c
index d763935..5264c03 100644
--- a/xfconfd/xfconf-backend-perchannel-xml.c
+++ b/xfconfd/xfconf-backend-perchannel-xml.c
@@ -52,7 +52,6 @@
#endif
#include <libxfce4util/libxfce4util.h>
-#include <dbus/dbus-glib.h>
#include "xfconf-backend-perchannel-xml.h"
#include "xfconf-backend.h"
diff --git a/xfconfd/xfconf-daemon.c b/xfconfd/xfconf-daemon.c
index f416e1a..361bbd5 100644
--- a/xfconfd/xfconf-daemon.c
+++ b/xfconfd/xfconf-daemon.c
@@ -1,6 +1,7 @@
/*
* xfconfd
- *
+ *
+ * Copyright (c) 2016 Ali Abdallah <ali at xfce.org>
* Copyright (c) 2007 Brian Tarricone <bjt23 at cornell.edu>
*
* This program is free software; you can redistribute it and/or modify
@@ -23,7 +24,6 @@
#include <string.h>
-#include <dbus/dbus-glib-lowlevel.h>
#include <libxfce4util/libxfce4util.h>
#include "xfconf-daemon.h"
@@ -33,109 +33,39 @@
#include "common/xfconf-gvaluefuncs.h"
#include "xfconf/xfconf-errors.h"
#include "common/xfconf-common-private.h"
-
-static void xfconf_set_property(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- const GValue *value,
- DBusGMethodInvocation *context);
-static void xfconf_get_property(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- DBusGMethodInvocation *context);
-static void xfconf_get_all_properties(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property_base,
- DBusGMethodInvocation *context);
-static void xfconf_property_exists(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- DBusGMethodInvocation *context);
-static void xfconf_reset_property(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- gboolean recursive,
- DBusGMethodInvocation *context);
-static void xfconf_list_channels(XfconfDaemon *xfconfd,
- DBusGMethodInvocation *context);
-static void xfconf_is_property_locked(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- DBusGMethodInvocation *context);
-
-#include "xfconf-dbus-server.h"
+#include "common/xfconf-gdbus-bindings.h"
struct _XfconfDaemon
{
- GObject parent;
-
- DBusGConnection *dbus_conn;
+ XfconfExportedSkeleton parent;
+ guint filter_id;
+
+ GDBusConnection *conn;
GList *backends;
};
typedef struct _XfconfDaemonClass
{
- GObjectClass parent;
+ XfconfExportedSkeletonClass parent;
} XfconfDaemonClass;
-enum
-{
- SIG_PROPERTY_CHANGED = 0,
- SIG_PROPERTY_REMOVED,
- N_SIGS,
-};
-
static void xfconf_daemon_finalize(GObject *obj);
-static DBusHandlerResult xfconf_daemon_handle_dbus_disconnect(DBusConnection *conn,
- DBusMessage *message,
- void *user_data);
-
-static guint signals[N_SIGS] = { 0, };
-
-
-G_DEFINE_TYPE(XfconfDaemon, xfconf_daemon, G_TYPE_OBJECT)
-
-
+G_DEFINE_TYPE(XfconfDaemon, xfconf_daemon, XFCONF_TYPE_EXPORTED_SKELETON)
+
static void
xfconf_daemon_class_init(XfconfDaemonClass *klass)
{
GObjectClass *object_class = (GObjectClass *)klass;
object_class->finalize = xfconf_daemon_finalize;
-
- signals[SIG_PROPERTY_CHANGED] = g_signal_new(I_("property-changed"),
- XFCONF_TYPE_DAEMON,
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- _xfconf_marshal_VOID__STRING_STRING_BOXED,
- G_TYPE_NONE,
- 3, G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_VALUE);
-
- signals[SIG_PROPERTY_REMOVED] = g_signal_new(I_("property-removed"),
- XFCONF_TYPE_DAEMON,
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- _xfconf_marshal_VOID__STRING_STRING,
- G_TYPE_NONE,
- 2, G_TYPE_STRING,
- G_TYPE_STRING);
-
- dbus_g_object_type_install_info(G_TYPE_FROM_CLASS(klass),
- &dbus_glib_xfconf_object_info);
- dbus_g_error_domain_register(XFCONF_ERROR, "org.xfce.Xfconf.Error",
- XFCONF_TYPE_ERROR);
}
static void
xfconf_daemon_init(XfconfDaemon *instance)
{
-
+ instance->filter_id = 0;
}
static void
@@ -151,11 +81,8 @@ xfconf_daemon_finalize(GObject *obj)
}
g_list_free(xfconfd->backends);
- if(xfconfd->dbus_conn) {
- dbus_connection_remove_filter(dbus_g_connection_get_connection(xfconfd->dbus_conn),
- xfconf_daemon_handle_dbus_disconnect,
- xfconfd);
- dbus_g_connection_unref(xfconfd->dbus_conn);
+ if(xfconfd->filter_id) {
+ g_signal_handler_disconnect (xfconfd->conn, xfconfd->filter_id);
}
G_OBJECT_CLASS(xfconf_daemon_parent_class)->finalize(obj);
@@ -174,17 +101,20 @@ xfconf_daemon_emit_property_changed_idled(gpointer data)
{
XfconfPropChangedData *pdata = data;
GValue value = { 0, };
-
xfconf_backend_get(pdata->backend, pdata->channel, pdata->property,
&value, NULL);
if(G_VALUE_TYPE(&value)) {
- g_signal_emit(G_OBJECT(pdata->xfconfd), signals[SIG_PROPERTY_CHANGED],
- 0, pdata->channel, pdata->property, &value);
+ GVariant *v;
+ v = g_variant_new_variant (xfconf_gvalue_to_gvariant (&value));
+ if (v) {
+ xfconf_exported_emit_property_changed ((XfconfExported*)pdata->xfconfd,
+ pdata->channel, pdata->property, v);
+ }
g_value_unset(&value);
} else {
- g_signal_emit(G_OBJECT(pdata->xfconfd), signals[SIG_PROPERTY_REMOVED],
- 0, pdata->channel, pdata->property);
+ xfconf_exported_emit_property_removed ((XfconfExported*)pdata->xfconfd,
+ pdata->channel, pdata->property);
}
g_object_unref(G_OBJECT(pdata->backend));
@@ -203,7 +133,6 @@ xfconf_daemon_backend_property_changed(XfconfBackend *backend,
gpointer user_data)
{
XfconfPropChangedData *pdata = g_slice_new0(XfconfPropChangedData);
-
pdata->xfconfd = g_object_ref(G_OBJECT(user_data));
pdata->backend = g_object_ref(G_OBJECT(backend));
pdata->channel = g_strdup(channel);
@@ -213,15 +142,16 @@ xfconf_daemon_backend_property_changed(XfconfBackend *backend,
}
static void
-xfconf_set_property(XfconfDaemon *xfconfd,
+xfconf_set_property(XfconfExported *skeleton,
+ GDBusMethodInvocation *invocation,
const gchar *channel,
const gchar *property,
- const GValue *value,
- DBusGMethodInvocation *context)
+ GVariant *variant,
+ XfconfDaemon *xfconfd)
{
GList *l;
GError *error = NULL;
-
+ GValue *value;
/* if there's more than one backend, we need to make sure the
* property isn't locked on ANY of them */
if(G_UNLIKELY(xfconfd->backends->next)) {
@@ -244,58 +174,73 @@ xfconf_set_property(XfconfDaemon *xfconfd,
/* there is always an error set if something failed or the
* property is locked */
if(error) {
- dbus_g_method_return_error(context, error);
+ g_dbus_method_invocation_return_gerror(invocation, error);
g_error_free(error);
return;
}
}
-
+
+ value = xfconf_gvariant_to_gvalue (variant);
/* only write to first backend */
if(xfconf_backend_set(xfconfd->backends->data, channel, property,
value, &error))
{
- dbus_g_method_return(context);
+ xfconf_exported_complete_set_property(skeleton, invocation);
} else {
- dbus_g_method_return_error(context, error);
+ g_dbus_method_invocation_return_gerror(invocation, error);
g_error_free(error);
}
+
+ g_value_unset (value);
+
}
+
static void
-xfconf_get_property(XfconfDaemon *xfconfd,
+xfconf_get_property(XfconfExported *skeleton,
+ GDBusMethodInvocation *invocation,
const gchar *channel,
const gchar *property,
- DBusGMethodInvocation *context)
+ XfconfDaemon *xfconfd)
{
GList *l;
GValue value = { 0, };
GError *error = NULL;
-
/* check each backend until we find a value */
for(l = xfconfd->backends; l; l = l->next) {
if(xfconf_backend_get(l->data, channel, property, &value, &error)) {
- dbus_g_method_return (context, &value);
+ GVariant *variant;
+ variant = g_variant_new_variant(xfconf_gvalue_to_gvariant (&value));
+ if (variant){
+ xfconf_exported_complete_get_property(skeleton, invocation, variant);
+ }
+ else {
+ g_set_error (&error, XFCONF_ERROR,
+ XFCONF_ERROR_INTERNAL_ERROR, _("GType transformation failed \"%s\""),
+ G_VALUE_TYPE_NAME(&value));
+ g_dbus_method_invocation_return_gerror(invocation, error);
+ g_error_free(error);
+ }
g_value_unset(&value);
return;
} else if(l->next)
g_clear_error(&error);
}
-
- dbus_g_method_return_error(context, error);
+ g_dbus_method_invocation_return_gerror(invocation, error);
g_error_free(error);
}
static void
-xfconf_get_all_properties(XfconfDaemon *xfconfd,
+xfconf_get_all_properties(XfconfExported *skeleton,
+ GDBusMethodInvocation *invocation,
const gchar *channel,
const gchar *property_base,
- DBusGMethodInvocation *context)
+ XfconfDaemon *xfconfd)
{
GList *l;
GHashTable *properties;
GError *error = NULL;
gboolean succeed = FALSE;
-
properties = g_hash_table_new_full(g_str_hash, g_str_equal,
(GDestroyNotify)g_free,
(GDestroyNotify)_xfconf_gvalue_free);
@@ -309,11 +254,13 @@ xfconf_get_all_properties(XfconfDaemon *xfconfd,
g_clear_error(&error);
}
}
-
- if(succeed)
- dbus_g_method_return (context, properties);
+ if(succeed) {
+ GVariant *variant;
+ variant = xfconf_hash_to_gvariant (properties);
+ xfconf_exported_complete_get_all_properties (skeleton, invocation, variant);
+ }
else
- dbus_g_method_return_error(context, error);
+ g_dbus_method_invocation_return_gerror(invocation, error);
if(error)
g_error_free(error);
@@ -321,16 +268,16 @@ xfconf_get_all_properties(XfconfDaemon *xfconfd,
}
static void
-xfconf_property_exists(XfconfDaemon *xfconfd,
+xfconf_property_exists(XfconfExported *skeleton,
+ GDBusMethodInvocation *invocation,
const gchar *channel,
const gchar *property,
- DBusGMethodInvocation *context)
+ XfconfDaemon *xfconfd)
{
gboolean exists = FALSE;
gboolean succeed = FALSE;
GList *l;
GError *error = NULL;
-
/* if at least one backend returns TRUE (regardles if |*exists| gets set
* to TRUE or FALSE), we'll return TRUE from this function */
@@ -342,19 +289,20 @@ xfconf_property_exists(XfconfDaemon *xfconfd,
}
if(succeed)
- dbus_g_method_return(context, exists);
+ xfconf_exported_complete_property_exists (skeleton, invocation, exists);
else {
- dbus_g_method_return_error(context, error);
+ g_dbus_method_invocation_return_gerror(invocation, error);
g_error_free(error);
}
}
static void
-xfconf_reset_property(XfconfDaemon *xfconfd,
+xfconf_reset_property(XfconfExported *skeleton,
+ GDBusMethodInvocation *invocation,
const gchar *channel,
const gchar *property,
gboolean recursive,
- DBusGMethodInvocation *context)
+ XfconfDaemon *xfconfd)
{
gboolean succeed = FALSE;
GList *l;
@@ -372,17 +320,18 @@ xfconf_reset_property(XfconfDaemon *xfconfd,
}
if(succeed)
- dbus_g_method_return(context);
+ xfconf_exported_complete_reset_property(skeleton, invocation);
else
- dbus_g_method_return_error(context, error);
+ g_dbus_method_invocation_return_gerror(invocation, error);
if(error)
g_error_free(error);
}
static void
-xfconf_list_channels(XfconfDaemon *xfconfd,
- DBusGMethodInvocation *context)
+xfconf_list_channels(XfconfExported *skeleton,
+ GDBusMethodInvocation *invocation,
+ XfconfDaemon *xfconfd)
{
GSList *lchannels = NULL, *chans_tmp, *lc;
GList *l;
@@ -401,14 +350,14 @@ xfconf_list_channels(XfconfDaemon *xfconfd,
if(error && !lchannels) {
/* no channels and an error, something went wrong */
- dbus_g_method_return_error(context, error);
+ g_dbus_method_invocation_return_gerror(invocation, error);
} else {
channels = g_new (gchar *, g_slist_length(lchannels) + 1);
for(lc = lchannels, i = 0; lc; lc = lc->next, ++i)
channels[i] = lc->data;
channels[i] = NULL;
-
- dbus_g_method_return(context, channels);
+
+ xfconf_exported_complete_list_channels (skeleton, invocation, (const gchar *const*)channels);
g_strfreev(channels);
g_slist_free(lchannels);
@@ -418,10 +367,11 @@ xfconf_list_channels(XfconfDaemon *xfconfd,
g_error_free(error);
}
-static void xfconf_is_property_locked(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- DBusGMethodInvocation *context)
+static void xfconf_is_property_locked(XfconfExported *skeleton,
+ GDBusMethodInvocation *invocation,
+ const gchar *channel,
+ const gchar *property,
+ XfconfDaemon *xfconfd)
{
GList *l;
gboolean locked = FALSE;
@@ -437,14 +387,35 @@ static void xfconf_is_property_locked(XfconfDaemon *xfconfd,
}
if(succeed)
- dbus_g_method_return(context, locked);
+ xfconf_exported_complete_is_property_locked(skeleton, invocation, locked);
else
- dbus_g_method_return_error(context, error);
+ g_dbus_method_invocation_return_gerror(invocation, error);
if(error)
g_error_free(error);
}
+static void
+xfconf_daemon_handle_dbus_disconnect(GDBusConnection *conn,
+ gboolean remote,
+ GError *error,
+ gpointer data)
+{
+ XfconfDaemon *xfconfd = (XfconfDaemon*)data;
+ GList *l;
+
+ DBG("got dbus disconnect; flushing all channels");
+
+ for(l = xfconfd->backends; l; l = l->next) {
+ GError *lerror = NULL;
+ if(!xfconf_backend_flush(XFCONF_BACKEND(l->data), &lerror)) {
+ g_critical("Failed to flush backend on disconnect: %s",
+ lerror->message);
+ g_error_free(lerror);
+ }
+ }
+
+}
@@ -453,38 +424,26 @@ xfconf_daemon_start(XfconfDaemon *xfconfd,
GError **error)
{
int ret;
- DBusError derror;
-
- xfconfd->dbus_conn = dbus_g_bus_get(DBUS_BUS_SESSION, error);
- if(G_UNLIKELY(!xfconfd->dbus_conn))
- return FALSE;
-
- dbus_g_connection_register_g_object(xfconfd->dbus_conn,
- "/org/xfce/Xfconf",
- G_OBJECT(xfconfd));
-
- dbus_connection_add_filter(dbus_g_connection_get_connection(xfconfd->dbus_conn),
- xfconf_daemon_handle_dbus_disconnect,
- xfconfd, NULL);
-
- dbus_error_init(&derror);
- ret = dbus_bus_request_name(dbus_g_connection_get_connection(xfconfd->dbus_conn),
- "org.xfce.Xfconf",
- DBUS_NAME_FLAG_DO_NOT_QUEUE,
- &derror);
- if(DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) {
- if(dbus_error_is_set(&derror)) {
- if(error)
- dbus_set_g_error(error, &derror);
- dbus_error_free(&derror);
- } else if(error) {
- g_set_error(error, DBUS_GERROR, DBUS_GERROR_FAILED,
- _("Another Xfconf daemon is already running"));
- }
+ xfconfd->conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, error);
+ if (G_UNLIKELY(!xfconfd->conn))
+ {
return FALSE;
}
-
+
+ ret =
+ g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON(xfconfd),
+ xfconfd->conn,
+ "/org/xfce/Xfconf",
+ error);
+
+ if (ret == FALSE)
+ return FALSE;
+
+ xfconfd->filter_id = g_signal_connect (xfconfd->conn, "closed",
+ G_CALLBACK(xfconf_daemon_handle_dbus_disconnect),
+ xfconfd);
+
return TRUE;
}
@@ -524,32 +483,6 @@ xfconf_daemon_load_config(XfconfDaemon *xfconfd,
return TRUE;
}
-static DBusHandlerResult
-xfconf_daemon_handle_dbus_disconnect(DBusConnection *conn,
- DBusMessage *message,
- void *user_data)
-{
- if(dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
- XfconfDaemon *xfconfd = user_data;
- GList *l;
-
- DBG("got dbus disconnect; flushing all channels");
-
- for(l = xfconfd->backends; l; l = l->next) {
- GError *error = NULL;
- if(!xfconf_backend_flush(XFCONF_BACKEND(l->data), &error)) {
- g_critical("Failed to flush backend on disconnect: %s",
- error->message);
- g_error_free(error);
- }
- }
- }
-
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-
-
XfconfDaemon *
xfconf_daemon_new_unique(gchar * const *backend_ids,
@@ -568,5 +501,26 @@ xfconf_daemon_new_unique(gchar * const *backend_ids,
return NULL;
}
+ g_signal_connect (xfconfd, "handle-get-all-properties",
+ G_CALLBACK(xfconf_get_all_properties), xfconfd);
+
+ g_signal_connect (xfconfd, "handle-get-property",
+ G_CALLBACK(xfconf_get_property), xfconfd);
+
+ g_signal_connect (xfconfd, "handle-is-property-locked",
+ G_CALLBACK(xfconf_is_property_locked), xfconfd);
+
+ g_signal_connect (xfconfd, "handle-list-channels",
+ G_CALLBACK(xfconf_list_channels), xfconfd);
+
+ g_signal_connect (xfconfd, "handle-property-exists",
+ G_CALLBACK(xfconf_property_exists), xfconfd);
+
+ g_signal_connect (xfconfd, "handle-reset-property",
+ G_CALLBACK(xfconf_reset_property), xfconfd);
+
+ g_signal_connect (xfconfd, "handle-set-property",
+ G_CALLBACK(xfconf_set_property), xfconfd);
+
return xfconfd;
}
diff --git a/xfconfd/xfconf-daemon.h b/xfconfd/xfconf-daemon.h
index f034af1..aaddb2a 100644
--- a/xfconfd/xfconf-daemon.h
+++ b/xfconfd/xfconf-daemon.h
@@ -21,6 +21,7 @@
#define __XFCONF_DAEMON_H__
#include <glib-object.h>
+#include "xfconf/xfconf-errors.h"
#define XFCONF_TYPE_DAEMON (xfconf_daemon_get_type())
#define XFCONF_DAEMON(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XFCONF_TYPE_DAEMON, XfconfDaemon))
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list