Merge the devel branch

conf/dconf/config.c

 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
  * Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
  * Copyright (C) 2008-2011 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 
 #include <string.h>
 #include <ibus.h>
 #include "config.h"
 
 #define DCONF_PREFIX "/desktop/ibus"
+#define DCONF_PRESERVE_NAME_PREFIXES_KEY \
+    DCONF_PREFIX"/general/dconf-preserve-name-prefixes"
 
 struct _IBusConfigDConf {
     IBusConfigService parent;
     DConfClient *client;
+
+    /* if a dconf path matches one of preserve_name_prefixes, don't convert
+       key names from/to GSettings key names (see _to_gsettings_name
+       and _from_gsettings_name) */
+    GSList *preserve_name_prefixes;
 };
 
 struct _IBusConfigDConfClass {
     IBusConfigServiceClass parent;
 };
 
 /* functions prototype */
 static void      ibus_config_dconf_class_init  (IBusConfigDConfClass *class);
 static void      ibus_config_dconf_init        (IBusConfigDConf      *config);
 static void      ibus_config_dconf_destroy     (IBusConfigDConf      *config);
@@ skipping 22 matching lines @@
     IBusObjectClass *object_class = IBUS_OBJECT_CLASS (class);
     IBusConfigServiceClass *config_class = IBUS_CONFIG_SERVICE_CLASS (class);
 
     object_class->destroy = (IBusObjectDestroyFunc) ibus_config_dconf_destroy;
     config_class->set_value = ibus_config_dconf_set_value;
     config_class->get_value = ibus_config_dconf_get_value;
     config_class->get_values = ibus_config_dconf_get_values;
     config_class->unset_value = ibus_config_dconf_unset_value;
 }
 
+static gboolean
+_has_prefixes (const gchar *path, GSList *prefixes)
+{
+    GSList *head = prefixes;
+    for (; head; head = head->next) {
+        if (g_str_has_prefix (path, head->data)) {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
 /* Convert key names from/to GSettings names.  While GSettings only
  * accepts lowercase letters / numbers / and dash ('-'), IBus uses
  * underscore ('_') and some engines even use uppercase letters.
  *
  * To minimize the gap, we do the following conversion:
  *
  * - when converting from IBus names to GSettings names, first convert
  *   all letters to lowercase and then replace underscores with dashes.
  * - when converting from GSettings names to IBus names, simply
  *   replace dashes with underscores.
@@ skipping 85 matching lines @@
             gkeys[i] = g_strdup_printf ("%s/%s", gpath, gname);
             g_free (gname);
         }
     }
 
     for (i = 0; i < n_items; i++) {
         gchar *gname, *path, *name;
         GVariant *variant = dconf_client_read (config->client, gkeys[i]);
 
         if (variant == NULL) {
-            /* Use a empty typle for a unset value */
+            /* Use a empty tuple for a unset value */
             variant = g_variant_new_tuple (NULL, 0);
         }
 
         gname = strrchr (gkeys[i], '/');
         g_assert (gname);
         *gname++ = '\0';
 
-        path = _from_gsettings_path (gkeys[i]);
-        name = _from_gsettings_name (gname);
+        if (_has_prefixes (gkeys[i], config->preserve_name_prefixes)) {
+            path = gkeys[i];
+            name = gname;
+        } else {
+            path = _from_gsettings_path (gkeys[i]);
+            name = _from_gsettings_name (gname);
+        }
 
         ibus_config_service_value_changed ((IBusConfigService *) config,
                                            path + sizeof (DCONF_PREFIX),
                                            name,
                                            variant);
-        g_free (path);
-        g_free (name);
+        if (path != gkeys[i]) {
+            g_free (path);
+        }
+        if (name != gname) {
+            g_free (name);
+        }
         g_variant_unref (variant);
     }
     g_strfreev (gkeys);
 }
 
 static void
 ibus_config_dconf_init (IBusConfigDConf *config)
 {
+    GVariant *variant;
     GError *error;
 
     config->client = dconf_client_new ("ibus",
                                        (DConfWatchFunc)_watch_func,
                                        config,
                                        NULL);
 
     error = NULL;
     if (!dconf_client_watch (config->client, DCONF_PREFIX"/", NULL, &error))
         g_warning ("Can not watch dconf path %s", DCONF_PREFIX"/");
+
+    config->preserve_name_prefixes = NULL;
+    variant = dconf_client_read (config->client,
+                                 DCONF_PRESERVE_NAME_PREFIXES_KEY);
+    if (variant != NULL) {
+        GVariantIter iter;
+        GVariant *child;
+
+        g_variant_iter_init (&iter, variant);
+        while ((child = g_variant_iter_next_value (&iter))) {
+            char *prefix = g_variant_dup_string (child, NULL);
+            config->preserve_name_prefixes =
+                g_slist_prepend (config->preserve_name_prefixes,
+                                 prefix);
+            g_variant_unref (child);
+        }
+        g_variant_unref (variant);
+    }
 }
 
 static void
 ibus_config_dconf_destroy (IBusConfigDConf *config)
 {
     if (config->client) {
         GError *error = NULL;
         if (!dconf_client_unwatch (config->client, DCONF_PREFIX"/", NULL, &error))
             g_warning ("Can not unwatch dconf path %s", DCONF_PREFIX"/");
 
         g_object_unref (config->client);
         config->client = NULL;
     }
+
+    g_slist_free_full (config->preserve_name_prefixes, (GDestroyNotify) g_free);
+    config->preserve_name_prefixes = NULL;
 
     IBUS_OBJECT_CLASS (ibus_config_dconf_parent_class)->
         destroy ((IBusObject *)config);
 }
 
 static gboolean
 ibus_config_dconf_set_value (IBusConfigService *config,
                              const gchar       *section,
                              const gchar       *name,
                              GVariant          *value,
                              GError           **error)
 {
-    DConfClient *client = ((IBusConfigDConf *)config)->client;
+    IBusConfigDConf *dconf = IBUS_CONFIG_DCONF (config);
+    DConfClient *client = dconf->client;
     gchar *path, *gpath, *gname, *gkey;
     gboolean retval;
 
     path = g_strdup_printf (DCONF_PREFIX"/%s", section);
-
     gpath = _to_gsettings_path (path);
-    gname = _to_gsettings_name (name);
+    g_free (path);
+
+    if (_has_prefixes (gpath, dconf->preserve_name_prefixes)) {
+        gname = (char *) name;
+    } else {
+        gname = _to_gsettings_name (name);
+    }
     gkey = g_strconcat (gpath, "/", gname, NULL);
     g_free (gpath);
-    g_free (gname);
+    if (gname != name) {
+        g_free (gname);
+    }
 
     retval = dconf_client_write (client,
                                  gkey,
                                  value,
                                  NULL,   /* tag */
                                  NULL,   /* cancellable */
                                  error);
     g_free (gkey);
 
     /* notify the caller that the value has changed, as dconf does not
        call watch_func when the caller is the process itself */
     if (retval) {
         if (value == NULL) {
-            /* Use a empty typle for a unset value */
+            /* Use a empty tuple for a unset value */
             value = g_variant_new_tuple (NULL, 0);
         }
         ibus_config_service_value_changed (config, section, name, value);
     }
     return retval;
 }
 
 static GVariant *
 ibus_config_dconf_get_value (IBusConfigService *config,
                              const gchar       *section,
                              const gchar       *name,
                              GError           **error)
 {
-    DConfClient *client = ((IBusConfigDConf *) config)->client;
+    IBusConfigDConf *dconf = IBUS_CONFIG_DCONF (config);
+    DConfClient *client = dconf->client;
     gchar *path, *gpath, *gname, *gkey;
     GVariant *variant;
 
     path = g_strdup_printf (DCONF_PREFIX"/%s", section);
-
     gpath = _to_gsettings_path (path);
-    gname = _to_gsettings_name (name);
+    g_free (path);
+
+    if (_has_prefixes (gpath, dconf->preserve_name_prefixes)) {
+        gname = (char *) name;
+    } else {
+        gname = _to_gsettings_name (name);
+    }
     gkey = g_strconcat (gpath, "/", gname, NULL);
     g_free (gpath);
-    g_free (gname);
+    if (gname != name) {
+        g_free (gname);
+    }
 
     variant = dconf_client_read (client, gkey);
     g_free (gkey);
 
     if (variant == NULL) {
         *error = g_error_new (G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
                         "Config value [%s:%s] does not exist.", section, name);
         return NULL;
     }
 
     return variant;
 }
 
 static GVariant *
 ibus_config_dconf_get_values (IBusConfigService *config,
                               const gchar       *section,
                               GError           **error)
 {
-    DConfClient *client = ((IBusConfigDConf *) config)->client;
+    IBusConfigDConf *dconf = IBUS_CONFIG_DCONF (config);
+    DConfClient *client = dconf->client;
     gchar *dir, *gdir;
     gint len;
     gchar **entries, **p;
     GVariantBuilder *builder;
+    gboolean preserve_name;
 
     dir = g_strdup_printf (DCONF_PREFIX"/%s/", section);
     gdir = _to_gsettings_path (dir);
     g_free (dir);
+
+    preserve_name = _has_prefixes (gdir, dconf->preserve_name_prefixes);
 
     entries = dconf_client_list (client, gdir, &len);
     builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
     for (p = entries; *p != NULL; p++) {
         gchar *gkey = g_strconcat (gdir, *p, NULL);
         GVariant *value = dconf_client_read (client, gkey);
         g_free (gkey);
         if (value) {
-            gchar *name = _from_gsettings_name (*p);
+            gchar *name = *p;
+            if (!preserve_name) {
+                name = _from_gsettings_name (*p);
+            }
             g_variant_builder_add (builder, "{sv}", name, value);
-            g_free (name);
+            if (name != *p) {
+                g_free (name);
+            }
             g_variant_unref (value);
         }
     }
     g_strfreev (entries);
     g_free (gdir);
 
     return g_variant_builder_end (builder);
 }
 
 static gboolean
 ibus_config_dconf_unset_value (IBusConfigService *config,
                                const gchar       *section,
                                const gchar       *name,
                                GError           **error)
 {
     return ibus_config_dconf_set_value (config, section, name, NULL, error);
 }
 
 IBusConfigDConf *
 ibus_config_dconf_new (GDBusConnection *connection)
 {
     IBusConfigDConf *config;
     config = (IBusConfigDConf *) g_object_new (IBUS_TYPE_CONFIG_DCONF,
                                                "object-path", IBUS_PATH_CONFIG,
                                                "connection", connection,
                                                NULL);
     return config;
 }