#ifndef __CONFIG_DCONF_H__
#define __CONFIG_DCONF_H__
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <ibus.h>
-#include <dconf/dconf.h>
+#ifdef DCONF_0_13_4
+# include <client/dconf-client.h>
+# include <common/dconf-paths.h>
+#else
+# include <dconf/dconf.h>
+#endif
#define IBUS_TYPE_CONFIG_DCONF \
(ibus_config_dconf_get_type ())
#include <string.h>
#include <ibus.h>
-#include "config.h"
+#include "config-private.h"
#define DCONF_PREFIX "/desktop/ibus"
#define DCONF_PRESERVE_NAME_PREFIXES_KEY \
_watch_func (DConfClient *client,
const gchar *gpath,
const gchar * const *items,
+#ifndef DCONF_0_13_4
gint n_items,
+#endif
const gchar *tag,
IBusConfigDConf *config)
{
gchar **gkeys = NULL;
gint i;
+#ifdef DCONF_0_13_4
+ gint n_items;
+
+ n_items = g_strv_length ((gchar **)items);
+#endif
g_return_if_fail (gpath != NULL);
g_return_if_fail (n_items >= 0);
ibus_config_dconf_init (IBusConfigDConf *config)
{
GVariant *variant;
+#ifdef DCONF_0_13_4
+ config->client = dconf_client_new ();
+
+ g_signal_connect (config->client, "changed",
+ G_CALLBACK (_watch_func), config);
+
+ dconf_client_watch_fast (config->client, DCONF_PREFIX"/");
+#else
GError *error;
config->client = dconf_client_new ("ibus",
error = NULL;
if (!dconf_client_watch (config->client, DCONF_PREFIX"/", NULL, &error))
g_warning ("Can not watch dconf path %s", DCONF_PREFIX"/");
+#endif
config->preserve_name_prefixes = NULL;
variant = dconf_client_read (config->client,
ibus_config_dconf_destroy (IBusConfigDConf *config)
{
if (config->client) {
+#ifdef DCONF_0_13_4
+ dconf_client_unwatch_fast (config->client, DCONF_PREFIX"/");
+#else
GError *error = NULL;
if (!dconf_client_unwatch (config->client, DCONF_PREFIX"/", NULL, &error))
g_warning ("Can not unwatch dconf path %s", DCONF_PREFIX"/");
+#endif
g_object_unref (config->client);
config->client = NULL;
g_free (gname);
}
+#ifdef DCONF_0_13_4
+ retval = dconf_client_write_fast (client, gkey, value, error);
+#else
retval = dconf_client_write (client,
gkey,
value,
NULL, /* tag */
NULL, /* cancellable */
error);
+#endif
g_free (gkey);
return retval;