Merge lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815 into lp:compiz-compizconfig-gsettings

[Sam Spilsbury]

Bug 874815

[lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815]

159. By Sam Spilsbury on 2011-10-26

Fix conflicts

160. By Sam Spilsbury on 2011-10-26

Merge in changes from truncation branch

161. By Sam Spilsbury on 2012-01-21

More descriptive names

Unmerged revisions

161. By Sam Spilsbury on 2012-01-21

More descriptive names

160. By Sam Spilsbury on 2011-10-26

Merge in changes from truncation branch

159. By Sam Spilsbury on 2011-10-26

Fix conflicts

=== modified file 'src/gconf-integration.c'
--- src/gconf-integration.c	2011-07-24 14:28:26 +0000
+++ src/gconf-integration.c	2011-10-15 07:07:06 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /**
  *
  * GSettings libccs backend
@@ -952,3 +953,959 @@
 	g_error_free (err);
 }
 #endif
+=======
+/**
+ *
+ * GSettings libccs backend
+ *
+ * gconf-integration.c
+ *
+ * Copyright (c) 2011 Canonical Ltd
+ *
+ * Based on the original compizconfig-backend-gconf
+ *
+ * Copyright (c) 2007 Danny Baumann <[e-mail]>
+ *
+ * Parts of this code are taken from libberylsettings 
+ * gconf backend, written by:
+ *
+ * Copyright (c) 2006 Robert Carr <[e-mail]>
+ * Copyright (c) 2007 Dennis Kasprzyk <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * Authored By:
+ *	Sam Spilsbury <[e-mail]>
+ *
+ **/
+
+#include "gsettings.h"
+#ifdef USE_GCONF
+GConfClient *client = NULL;
+guint gnomeGConfNotifyIds[NUM_WATCHED_DIRS];
+
+const SpecialOptionGConf specialOptions[] = {
+    {"run_key", "gnomecompat", FALSE,
+     METACITY "/global_keybindings/panel_run_dialog", OptionKey},
+    {"main_menu_key", "gnomecompat", FALSE,
+     METACITY "/global_keybindings/panel_main_menu", OptionKey},
+    {"run_command_screenshot_key", "gnomecompat", FALSE,
+     METACITY "/global_keybindings/run_command_screenshot", OptionKey},
+    {"run_command_window_screenshot_key", "gnomecompat", FALSE,
+     METACITY "/global_keybindings/run_command_window_screenshot", OptionKey},
+    {"run_command_terminal_key", "gnomecompat", FALSE,
+     METACITY "/global_keybindings/run_command_terminal", OptionKey},
+
+    {"toggle_window_maximized_key", "core", FALSE,
+     METACITY "/window_keybindings/toggle_maximized", OptionKey},
+    {"minimize_window_key", "core", FALSE,
+     METACITY "/window_keybindings/minimize", OptionKey},
+    {"maximize_window_key", "core", FALSE,
+     METACITY "/window_keybindings/maximize", OptionKey},
+    {"unmaximize_window_key", "core", FALSE,
+     METACITY "/window_keybindings/unmaximize", OptionKey},
+    {"maximize_window_horizontally_key", "core", FALSE,
+     METACITY "/window_keybindings/maximize_horizontally", OptionKey},
+    {"maximize_window_vertically_key", "core", FALSE,
+     METACITY "/window_keybindings/maximize_vertically", OptionKey},
+    {"raise_window_key", "core", FALSE,
+     METACITY "/window_keybindings/raise", OptionKey},
+    {"lower_window_key", "core", FALSE,
+     METACITY "/window_keybindings/lower", OptionKey},
+    {"close_window_key", "core", FALSE,
+     METACITY "/window_keybindings/close", OptionKey},
+    {"toggle_window_shaded_key", "core", FALSE,
+     METACITY "/window_keybindings/toggle_shaded", OptionKey},
+
+    {"show_desktop_key", "core", FALSE,
+     METACITY "/global_keybindings/show_desktop", OptionKey},
+
+    {"initiate_key", "move", FALSE,
+     METACITY "/window_keybindings/begin_move", OptionKey},
+    {"initiate_key", "resize", FALSE,
+     METACITY "/window_keybindings/begin_resize", OptionKey},
+    {"window_menu_key", "core", FALSE,
+     METACITY "/window_keybindings/activate_window_menu", OptionKey},
+
+    /* integration of Metacity's mouse_button_modifier option */
+    {"initiate_button", "move", FALSE,
+     METACITY "/window_keybindings/begin_move", OptionSpecial},
+    {"initiate_button", "resize", FALSE,
+     METACITY "/window_keybindings/begin_resize", OptionSpecial},
+    {"window_menu_button", "core", FALSE,
+     METACITY "/window_keybindings/activate_window_menu", OptionSpecial},
+    {"mouse_button_modifier", NULL, FALSE,
+     METACITY "/general/mouse_button_modifier", OptionSpecial},
+    /* integration of the Metacity's option to swap mouse buttons */
+    {"resize_with_right_button", NULL, FALSE,
+     METACITY "/general/resize_with_right_button", OptionSpecial},
+
+    {"visual_bell", "fade", TRUE,
+     METACITY "/general/visual_bell", OptionBool},
+    {"fullscreen_visual_bell", "fade", TRUE,
+     METACITY "/general/visual_bell_type", OptionSpecial},
+
+    {"next_key", "staticswitcher", FALSE,
+     METACITY "/global_keybindings/switch_windows", OptionKey},
+    {"prev_key", "staticswitcher", FALSE,
+     METACITY "/global_keybindings/switch_windows_backward", OptionKey},
+
+    {"toggle_sticky_key", "extrawm", FALSE,
+     METACITY "/window_keybindings/toggle_on_all_workspaces", OptionKey},
+    {"toggle_fullscreen_key", "extrawm", FALSE,
+     METACITY "/window_keybindings/toggle_fullscreen", OptionKey},
+
+    {"command0", "commands", FALSE,
+     METACITY "/keybinding_commands/command_1", OptionString},
+    {"command1", "commands", FALSE,
+     METACITY "/keybinding_commands/command_2", OptionString},
+    {"command2", "commands", FALSE,
+     METACITY "/keybinding_commands/command_3", OptionString},
+    {"command3", "commands", FALSE,
+     METACITY "/keybinding_commands/command_4", OptionString},
+    {"command4", "commands", FALSE,
+     METACITY "/keybinding_commands/command_5", OptionString},
+    {"command5", "commands", FALSE,
+     METACITY "/keybinding_commands/command_6", OptionString},
+    {"command6", "commands", FALSE,
+     METACITY "/keybinding_commands/command_7", OptionString},
+    {"command7", "commands", FALSE,
+     METACITY "/keybinding_commands/command_8", OptionString},
+    {"command8", "commands", FALSE,
+     METACITY "/keybinding_commands/command_9", OptionString},
+    {"command9", "commands", FALSE,
+     METACITY "/keybinding_commands/command_10", OptionString},
+    {"command10", "commands", FALSE,
+     METACITY "/keybinding_commands/command_11", OptionString},
+    {"command11", "commands", FALSE,
+     METACITY "/keybinding_commands/command_12", OptionString},
+
+    {"run_command0_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_1", OptionKey},
+    {"run_command1_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_2", OptionKey},
+    {"run_command2_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_3", OptionKey},
+    {"run_command3_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_4", OptionKey},
+    {"run_command4_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_5", OptionKey},
+    {"run_command5_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_6", OptionKey},
+    {"run_command6_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_7", OptionKey},
+    {"run_command7_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_8", OptionKey},
+    {"run_command8_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_9", OptionKey},
+    {"run_command9_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_10", OptionKey},
+    {"run_command10_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_11", OptionKey},
+    {"run_command11_key", "commands", FALSE,
+     METACITY "/global_keybindings/run_command_12", OptionKey},
+
+    {"rotate_to_1_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_1", OptionKey},
+    {"rotate_to_2_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_2", OptionKey},
+    {"rotate_to_3_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_3", OptionKey},
+    {"rotate_to_4_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_4", OptionKey},
+    {"rotate_to_5_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_5", OptionKey},
+    {"rotate_to_6_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_6", OptionKey},
+    {"rotate_to_7_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_7", OptionKey},
+    {"rotate_to_8_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_8", OptionKey},
+    {"rotate_to_9_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_9", OptionKey},
+    {"rotate_to_10_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_10", OptionKey},
+    {"rotate_to_11_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_11", OptionKey},
+    {"rotate_to_12_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_12", OptionKey},
+
+    {"rotate_left_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_left", OptionKey},
+    {"rotate_right_key", "rotate", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_right", OptionKey},
+
+    {"switch_to_1_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_1", OptionKey},
+    {"switch_to_2_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_2", OptionKey},
+    {"switch_to_3_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_3", OptionKey},
+    {"switch_to_4_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_4", OptionKey},
+    {"switch_to_5_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_5", OptionKey},
+    {"switch_to_6_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_6", OptionKey},
+    {"switch_to_7_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_7", OptionKey},
+    {"switch_to_8_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_8", OptionKey},
+    {"switch_to_9_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_9", OptionKey},
+    {"switch_to_10_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_10", OptionKey},
+    {"switch_to_11_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_11", OptionKey},
+    {"switch_to_12_key", "vpswitch", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_12", OptionKey},
+
+    {"up_key", "wall", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_up", OptionKey},
+    {"down_key", "wall", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_down", OptionKey},
+    {"left_key", "wall", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_left", OptionKey},
+    {"right_key", "wall", FALSE,
+     METACITY "/global_keybindings/switch_to_workspace_right", OptionKey},
+    {"left_window_key", "wall", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_left", OptionKey},
+    {"right_window_key", "wall", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_right", OptionKey},
+    {"up_window_key", "wall", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_up", OptionKey},
+    {"down_window_key", "wall", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_down", OptionKey},
+
+    {"put_topleft_key", "put", FALSE,
+     METACITY "/window_keybindings/move_to_corner_nw", OptionKey},
+    {"put_topright_key", "put", FALSE,
+     METACITY "/window_keybindings/move_to_corner_ne", OptionKey},
+    {"put_bottomleft_key", "put", FALSE,
+     METACITY "/window_keybindings/move_to_corner_sw", OptionKey},
+    {"put_bottomright_key", "put", FALSE,
+     METACITY "/window_keybindings/move_to_corner_se", OptionKey},
+    {"put_left_key", "put", FALSE,
+     METACITY "/window_keybindings/move_to_side_w", OptionKey},
+    {"put_right_key", "put", FALSE,
+     METACITY "/window_keybindings/move_to_side_e", OptionKey},
+    {"put_top_key", "put", FALSE,
+     METACITY "/window_keybindings/move_to_side_n", OptionKey},
+    {"put_bottom_key", "put", FALSE,
+     METACITY "/window_keybindings/move_to_side_s", OptionKey},
+
+    {"rotate_to_1_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_1", OptionKey},
+    {"rotate_to_2_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_2", OptionKey},
+    {"rotate_to_3_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_3", OptionKey},
+    {"rotate_to_4_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_4", OptionKey},
+    {"rotate_to_5_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_5", OptionKey},
+    {"rotate_to_6_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_6", OptionKey},
+    {"rotate_to_7_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_7", OptionKey},
+    {"rotate_to_8_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_8", OptionKey},
+    {"rotate_to_9_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_9", OptionKey},
+    {"rotate_to_10_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_10", OptionKey},
+    {"rotate_to_11_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_11", OptionKey},
+    {"rotate_to_12_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_12", OptionKey},
+
+    {"rotate_left_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_left", OptionKey},
+    {"rotate_right_window_key", "rotate", FALSE,
+     METACITY "/window_keybindings/move_to_workspace_right", OptionKey},
+
+    {"command_screenshot", "gnomecompat", FALSE,
+     METACITY "/keybinding_commands/command_screenshot", OptionString},
+    {"command_window_screenshot", "gnomecompat", FALSE,
+     METACITY "/keybinding_commands/command_window_screenshot", OptionString},
+    {"command_terminal", "gnomecompat", FALSE,
+     "/desktop/gnome/applications/terminal/exec", OptionString},
+
+    {"current_viewport", "thumbnail", TRUE,
+     "/apps/panel/applets/window_list/prefs/display_all_workspaces",
+     OptionSpecial},
+
+    {"autoraise", "core", FALSE,
+     METACITY "/general/auto_raise", OptionBool},
+    {"autoraise_delay", "core", FALSE,
+     METACITY "/general/auto_raise_delay", OptionInt},
+    {"raise_on_click", "core", FALSE,
+     METACITY "/general/raise_on_click", OptionBool},
+    {"click_to_focus", "core", FALSE,
+     METACITY "/general/focus_mode", OptionSpecial},
+
+    {"audible_bell", "core", FALSE,
+     METACITY "/general/audible_bell", OptionBool},
+    /*{"hsize", "core", TRUE,
+     METACITY "/general/num_workspaces", OptionInt},*/
+};
+
+static const char* watchedGConfGnomeDirectories[] = {
+    METACITY,
+    "/desktop/gnome/applications/terminal",
+    "/apps/panel/applets/window_list/prefs"
+};
+
+#define N_SOPTIONS (sizeof (specialOptions) / sizeof (struct _SpecialOptionGConf))
+
+static CCSSetting *
+findDisplaySettingForPlugin (CCSContext *context,
+			     const char *plugin,
+			     const char *setting)
+{
+    CCSPlugin  *p;
+    CCSSetting *s;
+
+    p = ccsFindPlugin (context, plugin);
+    if (!p)
+	return NULL;
+
+    s = ccsFindSetting (p, setting);
+    if (!s)
+	return NULL;
+
+    return s;
+}
+
+Bool
+isGConfIntegratedOption (CCSSetting *setting,
+			 int	    *index)
+{
+    unsigned int i;
+
+    for (i = 0; i < N_SOPTIONS; i++)
+    {
+	const SpecialOptionGConf *opt = &specialOptions[i];
+
+	if (strcmp (setting->name, opt->settingName) != 0)
+	    continue;
+
+	if (setting->parent->name)
+	{
+	    if (!opt->pluginName)
+		continue;
+	    if (strcmp (setting->parent->name, opt->pluginName) != 0)
+		continue;
+	}
+	else
+	{
+	    if (opt->pluginName)
+		continue;
+	}
+
+	if (index)
+	    *index = i;
+
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
+void
+gnomeGConfValueChanged (GConfClient *client,
+			guint       cnxn_id,
+			GConfEntry  *entry,
+			gpointer    user_data)
+{
+    CCSContext *context = (CCSContext *)user_data;
+    char       *keyName = (char*) gconf_entry_get_key (entry);
+    int        i, last = 0, num = 0;
+    Bool       needInit = TRUE;
+
+    if (!ccsGetIntegrationEnabled (context))
+	return;
+
+    /* we have to loop multiple times here, because one Gnome
+       option may be integrated with multiple Compiz options */
+
+    while (1)
+    {
+	for (i = last, num = -1; i < N_SOPTIONS; i++)
+	{
+	    if (strcmp (specialOptions[i].gnomeName, keyName) == 0)
+	    {
+		num = i;
+		last = i + 1;
+		break;
+	    }
+	}
+
+	if (num < 0)
+	    break;
+
+	if ((strcmp (specialOptions[num].settingName,
+		     "mouse_button_modifier") == 0) ||
+	    (strcmp (specialOptions[num].settingName,
+		    "resize_with_right_button") == 0))
+	{
+	    CCSSetting *s;
+
+	    if (needInit)
+	    {
+		readInit (context);
+		needInit = FALSE;
+	    }
+
+	    s = findDisplaySettingForPlugin (context, "core",
+					     "window_menu_button");
+	    if (s)
+		readSetting (context, s);
+
+	    s = findDisplaySettingForPlugin (context, "move",
+					     "initiate_button");
+	    if (s)
+		readSetting (context, s);
+
+	    s = findDisplaySettingForPlugin (context, "resize",
+					     "initiate_button");
+	    if (s)
+		readSetting (context, s);
+	}
+	else
+	{
+	    CCSPlugin     *plugin = NULL;
+	    CCSSetting    *setting;
+	    SpecialOptionGConf *opt = (SpecialOptionGConf *) &specialOptions[num];
+
+	    plugin = ccsFindPlugin (context, (char*) opt->pluginName);
+	    if (plugin)
+	    {
+		for (i = 0; i < 1; i++)
+		{
+		    setting = ccsFindSetting (plugin, (char*) opt->settingName);
+
+		    if (setting)
+		    {
+			if (needInit)
+			{
+			    readInit (context);
+			    needInit = FALSE;
+			}
+			readSetting (context, setting);
+		    }
+
+		    /* do not read display settings multiple
+		       times for multiscreen environments */
+		}
+	    }
+	}
+    }
+}
+
+void
+initGConfClient (CCSContext *context)
+{
+    int i;
+
+    client = gconf_client_get_default ();
+
+    for (i = 0; i < NUM_WATCHED_DIRS; i++)
+    {
+	gnomeGConfNotifyIds[i] = gconf_client_notify_add (client,
+						     watchedGConfGnomeDirectories[i],
+						     gnomeGConfValueChanged, context,
+						     NULL, NULL);
+	gconf_client_add_dir (client, watchedGConfGnomeDirectories[i],
+			      GCONF_CLIENT_PRELOAD_NONE, NULL);
+    }
+}
+
+void
+finiGConfClient (void)
+{
+    int i;
+
+    for (i = 0; i < NUM_WATCHED_DIRS; i++)
+    {
+	if (gnomeGConfNotifyIds[i])
+	{
+	    gconf_client_notify_remove (client, gnomeGConfNotifyIds[0]);
+	    gnomeGConfNotifyIds[i] = 0;
+	}
+	gconf_client_remove_dir (client, watchedGConfGnomeDirectories[i], NULL);
+    }
+    gconf_client_suggest_sync (client, NULL);
+
+    g_object_unref (client);
+    client = NULL;
+}
+
+static unsigned int
+getGnomeMouseButtonModifier(void)
+{
+    unsigned int modMask = 0;
+    GError       *err = NULL;
+    char         *value;
+
+    value = gconf_client_get_string (client,
+				     METACITY "/general/mouse_button_modifier",
+				     &err);
+
+    if (err)
+    {
+	g_error_free (err);
+	return 0;
+    }
+
+    if (!value)
+	return 0;
+
+    modMask = ccsStringToModifiers (value);
+    g_free (value);
+
+    return modMask;
+}
+
+static unsigned int
+getButtonBindingForSetting (CCSContext   *context,
+			    const char   *plugin,
+			    const char   *setting)
+{
+    CCSSetting *s;
+
+    s = findDisplaySettingForPlugin (context, plugin, setting);
+    if (!s)
+	return 0;
+
+    if (s->type != TypeButton)
+	return 0;
+
+    return s->value->value.asButton.button;
+}
+
+Bool
+readGConfIntegratedOption (CCSContext *context,
+			   CCSSetting *setting,
+			   int	      index)
+{
+    GConfValue *gconfValue;
+    GError     *err = NULL;
+    Bool       ret = FALSE;
+    
+    ret = readOption (setting);
+
+    gconfValue = gconf_client_get (client,
+				   specialOptions[index].gnomeName,
+				   &err);
+
+    if (err)
+    {
+	g_error_free (err);
+	return FALSE;
+    }
+
+    if (!gconfValue)
+	return FALSE;
+
+    switch (specialOptions[index].type) {
+    case OptionInt:
+	if (gconfValue->type == GCONF_VALUE_INT)
+	{
+	    guint value;
+
+	    value = gconf_value_get_int (gconfValue);
+	    ccsSetInt (setting, value, TRUE);
+	    ret = TRUE;
+	}
+	break;
+    case OptionBool:
+	if (gconfValue->type == GCONF_VALUE_BOOL)
+	{
+	    gboolean value;
+
+	    value = gconf_value_get_bool (gconfValue);
+	    ccsSetBool (setting, value ? TRUE : FALSE, FALSE);
+	    ret = TRUE;
+	}
+	break;
+    case OptionString:
+	if (gconfValue->type == GCONF_VALUE_STRING)
+	{
+	    const char *value;
+
+	    value = gconf_value_get_string (gconfValue);
+	    if (value)
+	    {
+		ccsSetString (setting, value, FALSE);
+		ret = TRUE;
+	    }
+	}
+	break;
+    case OptionKey:
+	if (gconfValue->type == GCONF_VALUE_STRING)
+	{
+	    const char *value;
+
+	    value = gconf_value_get_string (gconfValue);
+	    if (value)
+	    {
+		CCSSettingKeyValue key;
+
+		memset (&key, 0, sizeof (CCSSettingKeyValue));
+		ccsGetKey (setting, &key);
+		if (ccsStringToKeyBinding (value, &key))
+		{
+		    ccsSetKey (setting, key, TRUE);
+		    ret = TRUE;
+		}
+	    }
+	}
+	break;
+    case OptionSpecial:
+	{
+	    const char *settingName = specialOptions[index].settingName;
+	    const char *pluginName  = specialOptions[index].pluginName;
+
+	    if (strcmp (settingName, "current_viewport") == 0)
+	    {
+		if (gconfValue->type == GCONF_VALUE_BOOL)
+		{
+		    gboolean showAll;
+
+		    showAll = gconf_value_get_bool (gconfValue);
+		    ccsSetBool (setting, !showAll, FALSE);
+		    ret = TRUE;
+		}
+	    }
+	    else if (strcmp (settingName, "fullscreen_visual_bell") == 0)
+	    {
+		if (gconfValue->type == GCONF_VALUE_STRING)
+		{
+		    const char *value;
+
+		    value = gconf_value_get_string (gconfValue);
+		    if (value)
+		    {
+			Bool fullscreen;
+
+			fullscreen = strcmp (value, "fullscreen") == 0;
+			ccsSetBool (setting, fullscreen, FALSE);
+			ret = TRUE;
+		    }
+		}
+	    }
+	    else if (strcmp (settingName, "click_to_focus") == 0)
+	    {
+		if (gconfValue->type == GCONF_VALUE_STRING)
+		{
+		    const char *focusMode;
+
+		    focusMode = gconf_value_get_string (gconfValue);
+
+		    if (focusMode)
+		    {
+			Bool clickToFocus = (strcmp (focusMode, "click") == 0);
+			ccsSetBool (setting, clickToFocus, FALSE);
+			ret = TRUE;
+		    }
+		}
+	    }
+	    else if (((strcmp (settingName, "initiate_button") == 0) &&
+		      ((strcmp (pluginName, "move") == 0) ||
+		       (strcmp (pluginName, "resize") == 0))) ||
+		      ((strcmp (settingName, "window_menu_button") == 0) &&
+		       (strcmp (pluginName, "core") == 0)))
+	    {
+		gboolean              resizeWithRightButton;
+		CCSSettingButtonValue button;
+
+		memset (&button, 0, sizeof (CCSSettingButtonValue));
+		ccsGetButton (setting, &button);
+
+		button.buttonModMask = getGnomeMouseButtonModifier ();
+		
+		resizeWithRightButton =
+		    gconf_client_get_bool (client, METACITY
+					   "/general/resize_with_right_button",
+					   &err);
+
+		if (strcmp (settingName, "window_menu_button") == 0)
+		    button.button = resizeWithRightButton ? 2 : 3;
+		else if (strcmp (pluginName, "resize") == 0)
+		    button.button = resizeWithRightButton ? 3 : 2;
+		else
+		    button.button = 1;
+
+		ccsSetButton (setting, button, FALSE);
+		ret = TRUE;
+	    }
+	}
+     	break;
+    default:
+	break;
+    }
+
+    gconf_value_free (gconfValue);
+
+    return ret;
+}
+
+static Bool
+setGnomeMouseButtonModifier (unsigned int modMask)
+{
+    char   *modifiers, *currentValue;
+    GError *err = NULL;
+
+    modifiers = ccsModifiersToString (modMask);
+    if (!modifiers)
+	return FALSE;
+
+    currentValue = gconf_client_get_string (client,
+					    METACITY
+					    "/general/mouse_button_modifier",
+					    &err);
+    if (err)
+    {
+	free (modifiers);
+	g_error_free (err);
+	return FALSE;
+    }
+
+    if (!currentValue || (strcmp (currentValue, modifiers) != 0))
+	gconf_client_set_string (client,
+				 METACITY "/general/mouse_button_modifier",
+				 modifiers, NULL);
+    if (currentValue)
+	g_free (currentValue);
+
+    free (modifiers);
+
+    return TRUE;
+}
+
+static void
+setButtonBindingForSetting (CCSContext   *context,
+			    const char   *plugin,
+			    const char   *setting,
+			    unsigned int button,
+			    unsigned int buttonModMask)
+{
+    CCSSetting            *s;
+    CCSSettingButtonValue value;
+
+    s = findDisplaySettingForPlugin (context, plugin, setting);
+    if (!s)
+	return;
+
+    if (s->type != TypeButton)
+	return;
+
+    value = s->value->value.asButton;
+
+    if ((value.button != button) || (value.buttonModMask != buttonModMask))
+    {
+	value.button = button;
+	value.buttonModMask = buttonModMask;
+
+	ccsSetButton (s, value, FALSE);
+    }
+}
+
+void
+writeGConfIntegratedOption (CCSContext *context,
+			    CCSSetting *setting,
+			    int	       index)
+{
+    GError     *err = NULL;
+    const char *optionName = specialOptions[index].gnomeName;
+    
+    switch (specialOptions[index].type)
+    {
+    case OptionInt:
+	{
+	    int newValue, currentValue;
+	    if (!ccsGetInt (setting, &newValue))
+		break;
+	    currentValue = gconf_client_get_int (client, optionName, &err);
+
+	    if (!err && (currentValue != newValue))
+		gconf_client_set_int(client, specialOptions[index].gnomeName,
+				     newValue, NULL);
+	}
+	break;
+    case OptionBool:
+	{
+	    Bool     newValue;
+	    gboolean currentValue;
+	    if (!ccsGetBool (setting, &newValue))
+		break;
+    	    currentValue = gconf_client_get_bool (client, optionName, &err);
+
+	    if (!err && ((currentValue && !newValue) ||
+			 (!currentValue && newValue)))
+		gconf_client_set_bool (client, specialOptions[index].gnomeName,
+				       newValue, NULL);
+	}
+	break;
+    case OptionString:
+	{
+	    char  *newValue;
+	    gchar *currentValue;
+	    if (!ccsGetString (setting, &newValue))
+		break;
+	    currentValue = gconf_client_get_string (client, optionName, &err);
+
+    	    if (!err && currentValue)
+	    {
+		if (strcmp (currentValue, newValue) != 0)
+		    gconf_client_set_string (client, optionName,
+		     			     newValue, NULL);
+		g_free (currentValue);
+	    }
+	}
+	break;
+    case OptionKey:
+	{
+	    char  *newValue;
+	    gchar *currentValue;
+
+	    newValue = ccsKeyBindingToString (&setting->value->value.asKey);
+	    if (newValue)
+    	    {
+		if (strcmp (newValue, "Disabled") == 0)
+		{
+		    /* Metacity doesn't like "Disabled", it wants "disabled" */
+		    newValue[0] = 'd';
+		}
+
+		currentValue = gconf_client_get_string (client,
+							optionName, &err);
+
+		if (!err && currentValue)
+		{
+		    if (strcmp (currentValue, newValue) != 0)
+			gconf_client_set_string (client, optionName,
+				 		 newValue, NULL);
+    		    g_free (currentValue);
+		}
+		free (newValue);
+	    }
+	}
+	break;
+    case OptionSpecial:
+	{
+	    const char *settingName = specialOptions[index].settingName;
+	    const char *pluginName  = specialOptions[index].pluginName;
+
+	    if (strcmp (settingName, "current_viewport") == 0)
+	    {
+		Bool currentViewport;
+
+		if (!ccsGetBool (setting, &currentViewport))
+		    break;
+
+		gconf_client_set_bool (client, optionName,
+				       !currentViewport, NULL);
+	    }
+	    else if (strcmp (settingName, "fullscreen_visual_bell") == 0)
+	    {
+		Bool  fullscreen;
+		gchar *currentValue, *newValue;
+		if (!ccsGetBool (setting, &fullscreen))
+		    break;
+
+		newValue = fullscreen ? "fullscreen" : "frame_flash";
+		currentValue = gconf_client_get_string (client,
+							optionName, &err);
+		if (!err && currentValue)
+		{
+		    if (strcmp (currentValue, newValue) != 0)
+			gconf_client_set_string (client, optionName,
+						 newValue, NULL);
+		    g_free (currentValue);
+		}
+	    }
+	    else if (strcmp (settingName, "click_to_focus") == 0)
+	    {
+		Bool  clickToFocus;
+		gchar *newValue, *currentValue;
+		if (!ccsGetBool (setting, &clickToFocus))
+		    break;
+
+		newValue = clickToFocus ? "click" : "sloppy";
+		currentValue = gconf_client_get_string (client,
+							optionName, &err);
+
+		if (!err && currentValue)
+		{
+		    if (strcmp (currentValue, newValue) != 0)
+			gconf_client_set_string (client, optionName,
+						 newValue, NULL);
+		    g_free (currentValue);
+		}
+	    }
+	    else if (((strcmp (settingName, "initiate_button") == 0) &&
+		      ((strcmp (pluginName, "move") == 0) ||
+		       (strcmp (pluginName, "resize") == 0))) ||
+		      ((strcmp (settingName, "window_menu_button") == 0) &&
+		       (strcmp (pluginName, "core") == 0)))
+	    {
+		unsigned int modMask;
+		Bool         resizeWithRightButton = FALSE;
+		gboolean     currentValue;
+
+		if ((getButtonBindingForSetting (context, "resize",
+						 "initiate_button") == 3) ||
+		    (getButtonBindingForSetting (context, "core",
+						 "window_menu_button") == 2))
+		{
+		     resizeWithRightButton = TRUE;
+		}
+
+		currentValue =
+		    gconf_client_get_bool (client, METACITY
+					   "/general/resize_with_right_button",
+					   &err);
+
+		if (!err && ((currentValue && !resizeWithRightButton) ||
+			     (!currentValue && resizeWithRightButton)))
+		{
+		    gconf_client_set_bool (client,
+					   METACITY
+					   "/general/resize_with_right_button",
+					   resizeWithRightButton, NULL);
+		}
+
+		modMask = setting->value->value.asButton.buttonModMask;
+		if (setGnomeMouseButtonModifier (modMask))
+		{
+		    setButtonBindingForSetting (context, "move",
+						"initiate_button", 1, modMask);
+		    setButtonBindingForSetting (context, "resize",
+						"initiate_button", 
+						resizeWithRightButton ? 3 : 2,
+						modMask);
+		    setButtonBindingForSetting (context, "core",
+						"window_menu_button",
+						resizeWithRightButton ? 2 : 3,
+						modMask);
+		}
+	    }
+	}
+     	break;
+    }
+
+    if (err)
+	g_error_free (err);
+}
+#endif
+>>>>>>> MERGE-SOURCE
 
=== modified file 'src/gsettings.c'
--- src/gsettings.c	2011-07-29 15:41:46 +0000
+++ src/gsettings.c	2011-10-15 07:07:06 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /**
  *
  * GSettings libccs backend
@@ -1255,3 +1256,1297 @@
     return &gsettingsVTable;
 }
 
+=======
+/**
+ *
+ * GSettings libccs backend
+ *
+ * gsettings.c
+ *
+ * Copyright (c) 2011 Canonical Ltd
+ *
+ * Based on the original compizconfig-backend-gconf
+ *
+ * Copyright (c) 2007 Danny Baumann <[e-mail]>
+ *
+ * Parts of this code are taken from libberylsettings
+ * gconf backend, written by:
+ *
+ * Copyright (c) 2006 Robert Carr <[e-mail]>
+ * Copyright (c) 2007 Dennis Kasprzyk <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * Authored By:
+ *	Sam Spilsbury <[e-mail]>
+ *
+ **/
+
+#include "gsettings.h"
+
+static void
+valueChanged (GSettings   *settings,
+	      gchar	  *keyname,
+	      gpointer    user_data);
+
+static void
+gnomeValueChanged (GSettings   *settings,
+		   gchar       *keyname,
+		   gpointer    user_data);
+
+static GList	   *settingsList = NULL;
+static GSettings   *compizconfigSettings = NULL;
+static GSettings   *currentProfileSettings = NULL;
+static GList	   *watchedGnomeSettings = NULL;
+
+char *currentProfile = NULL;
+
+/* some forward declarations */
+static void writeIntegratedOption (CCSContext *context,
+				   CCSSetting *setting,
+				   int        index);
+
+typedef struct _SpecialOptionGSettings {
+    const char*       settingName;
+    const char*       pluginName;
+    const char*       schemaName;
+    const char*	      keyName;
+    const char*	      type;
+} SpecialOption;
+
+static gchar *
+getSchemaNameForPlugin (const char *plugin)
+{
+    gchar       *schemaName =  NULL;
+
+    schemaName = g_strconcat (COMPIZ_SCHEMA_ID, ".", plugin, NULL);
+
+    return schemaName;
+}
+
+static inline gchar *
+translateKeyForGSettings (char *gsettingName)
+{
+    gchar *clean        = NULL;
+    gchar **delimited   = NULL;
+    guint i		= 0;
+
+    /* Replace underscores with dashes */
+    delimited = g_strsplit (gsettingName, "_", 0);
+
+    clean = g_strjoinv ("-", delimited);
+
+    /* It can't be more than 32 chars, warn if that's the case */
+    gchar *ret = g_strndup (clean, 31);
+
+    if (strlen (clean) > 31)
+	printf ("GSettings Backend: Warning: key name %s is not valid in GSettings, it was changed to %s, this may cause problems!\n", clean, ret);
+
+    /* Everything must be lowercase */
+    for (; i < strlen (ret); i++)
+	ret[i] = g_ascii_tolower (ret[i]);
+
+    g_free (clean);
+    g_strfreev (delimited);
+
+    return ret;
+}
+
+static inline gchar *
+translateKeyForCCS (char *gsettingName)
+{
+    gchar *clean        = NULL;
+    gchar **delimited   = NULL;
+
+    /* Replace dashes with underscores */
+    delimited = g_strsplit (gsettingName, "-", 0);
+
+    clean = g_strjoinv ("_", delimited);
+
+    /* FIXME: Truncated and lowercased settings aren't going to work */
+
+    g_strfreev (delimited);
+
+    return clean;
+}
+
+static GSettings *
+getSettingsObjectForPluginWithPath (const char *plugin,
+				  const char *path,
+				  CCSContext *context)
+{
+    GSettings *settingsObj = NULL;
+    GList *l = settingsList;
+    gchar *schemaName = getSchemaNameForPlugin (plugin);
+    GVariant        *writtenPlugins;
+    char	    *plug;
+    GVariant        *newWrittenPlugins;
+    GVariantBuilder *newWrittenPluginsBuilder;
+    GVariantIter    *iter;
+    gboolean	    found = FALSE;
+
+    while (l)
+    {
+	settingsObj = (GSettings *) l->data;
+	gchar	  *name = NULL;
+
+	g_object_get (G_OBJECT (settingsObj),
+		      "schema",
+		      &name, NULL);
+	if (g_strcmp0 (name, schemaName) == 0)
+	{
+	    g_free (name);
+	    g_free (schemaName);
+
+	    return settingsObj;
+	}
+
+	l = g_list_next (l);
+    }
+
+    /* No existing settings object found for this schema, create one */
+
+    settingsObj = g_settings_new_with_path (schemaName, path);
+
+    g_signal_connect (G_OBJECT (settingsObj), "changed", (GCallback) valueChanged, (gpointer) context);
+
+    settingsList = g_list_append (settingsList, (void *) settingsObj);
+
+    /* Also write the plugin name to the list of modified plugins so
+     * that when we delete the profile the keys for that profile are also
+     * unset FIXME: This could be a little more efficient, like we could
+     * store keys that have changed from their defaults ... though
+     * gsettings doesn't seem to give you a way to get all of the schemas */
+
+    writtenPlugins = g_settings_get_value (currentProfileSettings, "plugins-with-set-keys");
+
+    newWrittenPluginsBuilder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+
+    iter = g_variant_iter_new (writtenPlugins);
+    while (g_variant_iter_next (iter, "s", &plug))
+    {
+	g_variant_builder_add (newWrittenPluginsBuilder, "s", plug);
+
+	if (!found)
+	    found = (g_strcmp0 (plug, plugin) == 0);
+
+	g_free (plug);
+    }
+
+    if (!found)
+	g_variant_builder_add (newWrittenPluginsBuilder, "s", plugin);
+
+    newWrittenPlugins = g_variant_new ("as", newWrittenPluginsBuilder);
+    g_settings_set_value (currentProfileSettings, "plugins-with-set-keys", newWrittenPlugins);
+
+    g_variant_iter_free (iter);
+    g_variant_unref (newWrittenPlugins);
+    g_variant_builder_unref (newWrittenPluginsBuilder);
+
+    return settingsObj;
+}
+
+static GSettings *
+getSettingsObjectForCCSSetting (CCSSetting *setting)
+{
+    KEYNAME(setting->parent->context->screenNum);
+    PATHNAME (setting->parent->name, keyName);
+
+    return getSettingsObjectForPluginWithPath (setting->parent->name, pathName, setting->parent->context);
+}
+
+static Bool
+isIntegratedOption (CCSSetting *setting,
+		    int        *index)
+{
+#ifdef USE_GCONF
+    return isGConfIntegratedOption (setting, index);
+#else
+    return FALSE;
+#endif
+}
+
+static void
+gnomeValueChanged (GSettings *settings,
+		   gchar     *keyName,
+		   gpointer  user_data)
+{
+}
+
+static void
+valueChanged (GSettings   *settings,
+	      gchar	  *keyName,
+	      gpointer    user_data)
+{
+    CCSContext   *context = (CCSContext *)user_data;
+    char	 *uncleanKeyName;
+    char	 *path;
+    char         *token;
+    int          index;
+    unsigned int screenNum;
+    CCSPlugin    *plugin;
+    CCSSetting   *setting;
+
+    g_object_get (G_OBJECT (settings), "path", &path, NULL);
+
+    path += strlen (COMPIZ) + 1;
+
+    token = strsep (&path, "/"); /* Profile name */
+    if (!token)
+	return;
+
+    token = strsep (&path, "/"); /* plugins */
+    if (!token)
+	return;
+
+    token = strsep (&path, "/"); /* plugin */
+    if (!token)
+	return;
+
+    plugin = ccsFindPlugin (context, token);
+    if (!plugin)
+	return;
+
+    token = strsep (&path, "/"); /* screen%i */
+    if (!token)
+	return;
+
+    sscanf (token, "screen%d", &screenNum);
+
+    uncleanKeyName = translateKeyForCCS (keyName);
+
+    setting = ccsFindSetting (plugin, uncleanKeyName);
+
+    /* Try again, this time truncating the settings themselves */
+    if (!setting)
+    {
+	char *cleanKeyName;
+	CCSSettingList it = ccsGetPluginSettings (plugin);
+
+	while (it)
+	{
+	    cleanKeyName = translateKeyForGSettings (((CCSSetting *) it->data)->name);
+
+	    if (g_strcmp0 (cleanKeyName, keyName) == 0)
+	    {
+		free (cleanKeyName);
+		setting = it->data;
+		break;
+	    }
+
+	    free (cleanKeyName);
+
+	    it = it->next;
+	}
+    }
+
+    if (!setting)
+    {
+	printf ("GSettings Backend: unable to find setting %s, for path %s\n", uncleanKeyName, path);
+	free (uncleanKeyName);
+	return;
+    }
+
+    readInit (context);
+    if (!readOption (setting))
+    {
+	ccsResetToDefault (setting, TRUE);
+    }
+
+    if (ccsGetIntegrationEnabled (context) &&
+	isIntegratedOption (setting, &index))
+    {
+	writeInit (context);
+	writeIntegratedOption (context, setting, index);
+    }
+
+    free (uncleanKeyName);
+}
+
+static Bool
+readListValue (CCSSetting *setting)
+{
+    GSettings		*settings = getSettingsObjectForCCSSetting (setting);
+    gchar		*variantType;
+    unsigned int        nItems, i = 0;
+    CCSSettingValueList list = NULL;
+    GVariant		*value;
+    GVariantIter	*iter;
+
+    char *cleanSettingName = translateKeyForGSettings (setting->name);
+
+    switch (setting->info.forList.listType)
+    {
+    case TypeString:
+    case TypeMatch:
+    case TypeColor:
+	variantType = g_strdup ("s");
+	break;
+    case TypeBool:
+	variantType = g_strdup ("b");
+	break;
+    case TypeInt:
+	variantType = g_strdup ("i");
+	break;
+    case TypeFloat:
+	variantType = g_strdup ("d");
+	break;
+    default:
+	variantType = NULL;
+	break;
+    }
+
+    if (!variantType)
+	return FALSE;
+
+    value = g_settings_get_value (settings, cleanSettingName);
+    if (!value)
+    {
+	ccsResetToDefault (setting, TRUE);
+	return TRUE;
+    }
+
+    iter = g_variant_iter_new (value);
+    nItems = g_variant_iter_n_children (iter);
+
+    if (nItems)
+    {
+	switch (setting->info.forList.listType)
+	{
+	case TypeBool:
+	{
+	    Bool *array = malloc (nItems * sizeof (Bool));
+	    Bool *arrayCounter = array;
+	    gboolean v;
+
+	    if (!array)
+		break;
+
+	    /* Reads each item from the variant into the position pointed
+	     * at by arrayCounter */
+	    while (g_variant_iter_next (iter, variantType, &v))
+	    {
+		*arrayCounter++ = v;
+	    }
+
+	    list = ccsGetValueListFromBoolArray (array, nItems, setting);
+	    free (array);
+	}
+	break;
+	case TypeInt:
+	{
+	    int *array = malloc (nItems * sizeof (int));
+	    int *arrayCounter = array;
+
+	    if (!array)
+		break;
+
+	    /* Reads each item from the variant into the position pointed
+	     * at by arrayCounter */
+	    while (g_variant_iter_next (iter, variantType, arrayCounter++));
+
+	    list = ccsGetValueListFromIntArray (array, nItems, setting);
+	    free (array);
+	}
+	break;
+	case TypeFloat:
+	{
+	    double *array = malloc (nItems * sizeof (double));
+	    double *arrayCounter = array;
+
+	    if (!array)
+		break;
+
+	    /* Reads each item from the variant into the position pointed
+	     * at by arrayCounter */
+	    while (g_variant_iter_next (iter, variantType, arrayCounter++));
+
+	    list = ccsGetValueListFromFloatArray ((float *) array, nItems, setting);
+	    free (array);
+	}
+	break;
+	case TypeString:
+	case TypeMatch:
+	{
+	    char **array = calloc (1, (nItems + 1) * sizeof (char *));
+	    char **arrayCounter = array;
+
+	    if (!array)
+	    {
+		break;
+	    }
+
+	    /* Reads each item from the variant into the position pointed
+	     * at by arrayCounter */
+	    while (g_variant_iter_next (iter, variantType, arrayCounter++));
+
+	    list = ccsGetValueListFromStringArray (array, nItems, setting);
+	    for (i = 0; i < nItems; i++)
+		if (array[i])
+		    free (array[i]);
+	    free (array);
+	}
+	break;
+	case TypeColor:
+	{
+	    CCSSettingColorValue *array;
+	    char		 *colorValue;
+	    array = malloc (nItems * sizeof (CCSSettingColorValue));
+	    if (!array)
+		break;
+
+	    while (g_variant_iter_next (iter, variantType, &colorValue))
+    	    {
+		memset (&array[i], 0, sizeof (CCSSettingColorValue));
+		ccsStringToColor (colorValue,
+				  &array[i]);
+	    }
+	    list = ccsGetValueListFromColorArray (array, nItems, setting);
+	    free (array);
+	}
+	break;
+	default:
+	    break;
+	}
+    }
+
+    free (cleanSettingName);
+    free (variantType);
+
+    if (list)
+    {
+	ccsSetList (setting, list, TRUE);
+	ccsSettingValueListFree (list, TRUE);
+	return TRUE;
+    }
+    else
+	ccsResetToDefault (setting, TRUE);
+
+    return FALSE;
+}
+
+static Bool
+readIntegratedOption (CCSContext *context,
+		      CCSSetting *setting,
+		      int        index)
+{
+#ifdef USE_GCONF
+    return readGConfIntegratedOption (context, setting, index);
+#else
+    return FALSE;
+#endif
+}
+
+Bool
+readOption (CCSSetting * setting)
+{
+    GSettings  *settings = getSettingsObjectForCCSSetting (setting);
+    GVariant   *gsettingsValue = NULL;
+    Bool       ret = FALSE;
+    Bool       valid = TRUE;
+
+    /* It is impossible for certain settings to have a schema,
+     * such as actions and read only settings, so in that case
+     * just return FALSE since compizconfig doesn't expect us
+     * to read them anyways */
+
+    if (setting->type == TypeAction ||
+	ccsSettingIsReadOnly (setting))
+    {
+	return FALSE;
+    }
+
+    char *cleanSettingName = translateKeyForGSettings (setting->name);
+    KEYNAME(setting->parent->context->screenNum);
+    PATHNAME (setting->parent->name, keyName);
+
+    /* first check if the key is set */
+    gsettingsValue = g_settings_get_value (settings, cleanSettingName);
+
+    switch (setting->type)
+    {
+    case TypeString:
+    case TypeMatch:
+    case TypeColor:
+    case TypeKey:
+    case TypeButton:
+    case TypeEdge:
+	valid = (g_variant_type_is_subtype_of (G_VARIANT_TYPE_STRING, g_variant_get_type (gsettingsValue)));
+	break;
+    case TypeInt:
+	valid = (g_variant_type_is_subtype_of (G_VARIANT_TYPE_INT32, g_variant_get_type (gsettingsValue)));
+	break;
+    case TypeBool:
+    case TypeBell:
+	valid = (g_variant_type_is_subtype_of (G_VARIANT_TYPE_BOOLEAN, g_variant_get_type (gsettingsValue)));
+	break;
+    case TypeFloat:
+	valid = (g_variant_type_is_subtype_of (G_VARIANT_TYPE_DOUBLE, g_variant_get_type (gsettingsValue)));
+	break;
+    case TypeList:
+	valid = (g_variant_type_is_array (g_variant_get_type (gsettingsValue)));
+	break;
+    default:
+	break;
+    }
+
+    if (!valid)
+    {
+	printf ("GSettings backend: There is an unsupported value at path %s. "
+		"Settings from this path won't be read. Try to remove "
+		"that value so that operation can continue properly.\n",
+		pathName);
+	free (cleanSettingName);
+	g_variant_unref (gsettingsValue);
+	return FALSE;
+    }
+
+    switch (setting->type)
+    {
+    case TypeString:
+	{
+	    const char *value;
+	    value = g_variant_get_string (gsettingsValue, NULL);
+	    if (value)
+	    {
+		ccsSetString (setting, value, FALSE);
+		ret = TRUE;
+	    }
+	}
+	break;
+    case TypeMatch:
+	{
+	    const char * value;
+	    value = g_variant_get_string (gsettingsValue, NULL);
+	    if (value)
+	    {
+		ccsSetMatch (setting, value, FALSE);
+		ret = TRUE;
+	    }
+	}
+	break;
+    case TypeInt:
+	{
+	    int value;
+	    value = g_variant_get_int32 (gsettingsValue);
+
+	    ccsSetInt (setting, value, FALSE);
+	    ret = TRUE;
+	}
+	break;
+    case TypeBool:
+	{
+	    gboolean value;
+	    value = g_variant_get_boolean (gsettingsValue);
+
+	    ccsSetBool (setting, value ? TRUE : FALSE, FALSE);
+	    ret = TRUE;
+	}
+	break;
+    case TypeFloat:
+	{
+	    double value;
+	    value = g_variant_get_double (gsettingsValue);
+
+	    ccsSetFloat (setting, (float)value, FALSE);
+    	    ret = TRUE;
+	}
+	break;
+    case TypeColor:
+	{
+	    const char           *value;
+	    CCSSettingColorValue color;
+	    value = g_variant_get_string (gsettingsValue, NULL);
+
+	    if (value && ccsStringToColor (value, &color))
+	    {
+		ccsSetColor (setting, color, FALSE);
+		ret = TRUE;
+	    }
+	}
+	break;
+    case TypeKey:
+	{
+	    const char         *value;
+	    CCSSettingKeyValue key;
+	    value = g_variant_get_string (gsettingsValue, NULL);
+
+	    if (value && ccsStringToKeyBinding (value, &key))
+	    {
+		ccsSetKey (setting, key, FALSE);
+		ret = TRUE;
+	    }
+	}
+	break;
+    case TypeButton:
+	{
+	    const char            *value;
+	    CCSSettingButtonValue button;
+	    value = g_variant_get_string (gsettingsValue, NULL);
+
+	    if (value && ccsStringToButtonBinding (value, &button))
+	    {
+		ccsSetButton (setting, button, FALSE);
+		ret = TRUE;
+	    }
+	}
+	break;
+    case TypeEdge:
+	{
+	    const char   *value;
+	    value = g_variant_get_string (gsettingsValue, NULL);
+
+	    if (value)
+	    {
+		unsigned int edges;
+		edges = ccsStringToEdges (value);
+		ccsSetEdge (setting, edges, FALSE);
+		ret = TRUE;
+	    }
+	}
+	break;
+    case TypeBell:
+	{
+	    gboolean value;
+	    value = g_variant_get_boolean (gsettingsValue);
+
+	    ccsSetBell (setting, value ? TRUE : FALSE, FALSE);
+	    ret = TRUE;
+	}
+	break;
+    case TypeList:
+	ret = readListValue (setting);
+	break;
+    default:
+	printf("GSettings backend: attempt to read unsupported setting type %d!\n",
+	       setting->type);
+	break;
+    }
+
+    free (cleanSettingName);
+    g_variant_unref (gsettingsValue);
+
+    return ret;
+}
+
+static void
+writeListValue (CCSSetting *setting,
+		char       *pathName)
+{
+    GSettings  		*settings = getSettingsObjectForCCSSetting (setting);
+    GVariant 		*value;
+    gchar		*variantType = NULL;
+    CCSSettingValueList list;
+
+    char *cleanSettingName = translateKeyForGSettings (setting->name);
+
+    if (!ccsGetList (setting, &list))
+	return;
+
+    switch (setting->info.forList.listType)
+    {
+    case TypeBool:
+	{
+	    variantType = "ab";
+	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("ab"));
+	    while (list)
+	    {
+		g_variant_builder_add (builder, "b", list->data->value.asBool);
+		list = list->next;
+	    }
+	    value = g_variant_new ("ab", builder);
+	    g_variant_builder_unref (builder);
+	}
+	break;
+    case TypeInt:
+	{
+	    variantType = "ai";
+	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("ai"));
+	    while (list)
+	    {
+		g_variant_builder_add (builder, "i", list->data->value.asInt);
+		list = list->next;
+    	    }
+    	    value = g_variant_new ("ai", builder);
+	    g_variant_builder_unref (builder);
+	}
+	break;
+    case TypeFloat:
+	{
+	    variantType = "ad";
+	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("ad"));
+	    while (list)
+	    {
+		g_variant_builder_add (builder, "d", (gdouble) list->data->value.asFloat);
+		list = list->next;
+	    }
+	    value = g_variant_new ("ad", builder);
+	    g_variant_builder_unref (builder);
+	}
+	break;
+    case TypeString:
+	{
+	    variantType = "as";
+	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+	    while (list)
+	    {
+		g_variant_builder_add (builder, "s", list->data->value.asString);
+		list = list->next;
+	    }
+	    value = g_variant_new ("as", builder);
+	    g_variant_builder_unref (builder);
+	}
+	break;
+    case TypeMatch:
+	{
+	    variantType = "as";
+	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+	    while (list)
+	    {
+		g_variant_builder_add (builder, "s", list->data->value.asMatch);
+		list = list->next;
+	    }
+	    value = g_variant_new ("as", builder);
+	    g_variant_builder_unref (builder);
+	}
+	break;
+    case TypeColor:
+	{
+	    variantType = "as";
+	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+	    char *item;
+	    while (list)
+	    {
+		item = ccsColorToString (&list->data->value.asColor);
+		g_variant_builder_add (builder, "s", item);
+		list = list->next;
+	    }
+	    value = g_variant_new ("as", builder);
+	    g_variant_builder_unref (builder);
+	}
+	break;
+    default:
+	printf("GSettings backend: attempt to write unsupported list type %d!\n",
+	       setting->info.forList.listType);
+	variantType = NULL;
+	break;
+    }
+
+    if (variantType != NULL)
+    {
+	g_settings_set_value (settings, cleanSettingName, value);
+	g_variant_unref (value);
+    }
+
+    free (cleanSettingName);
+}
+
+static void
+writeIntegratedOption (CCSContext *context,
+		       CCSSetting *setting,
+		       int        index)
+{
+#ifdef USE_GCONF
+    writeGConfIntegratedOption (context, setting, index);
+#endif
+
+    return;
+}
+
+static void
+resetOptionToDefault (CCSSetting * setting)
+{
+    GSettings  *settings = getSettingsObjectForCCSSetting (setting);
+
+    char *cleanSettingName = translateKeyForGSettings (setting->name);
+    KEYNAME (setting->parent->context->screenNum);
+    PATHNAME (setting->parent->name, keyName);
+
+    g_settings_reset (settings, cleanSettingName);
+
+    free (cleanSettingName);
+}
+
+void
+writeOption (CCSSetting * setting)
+{
+    GSettings  *settings = getSettingsObjectForCCSSetting (setting);
+    char *cleanSettingName = translateKeyForGSettings (setting->name);
+    KEYNAME (setting->parent->context->screenNum);
+    PATHNAME (setting->parent->name, keyName);
+
+    switch (setting->type)
+    {
+    case TypeString:
+	{
+	    char *value;
+	    if (ccsGetString (setting, &value))
+	    {
+		g_settings_set (settings, cleanSettingName, "s", value, NULL);
+	    }
+	}
+	break;
+    case TypeMatch:
+	{
+	    char *value;
+	    if (ccsGetMatch (setting, &value))
+	    {
+		g_settings_set (settings, cleanSettingName, "s", value, NULL);
+	    }
+	}
+    case TypeFloat:
+	{
+	    float value;
+	    if (ccsGetFloat (setting, &value))
+	    {
+		g_settings_set (settings, cleanSettingName, "d", (double) value, NULL);
+	    }
+	}
+	break;
+    case TypeInt:
+	{
+	    int value;
+	    if (ccsGetInt (setting, &value))
+	    {
+		g_settings_set (settings, cleanSettingName, "i", value, NULL);
+	    }
+	}
+	break;
+    case TypeBool:
+	{
+	    Bool value;
+	    if (ccsGetBool (setting, &value))
+	    {
+		g_settings_set (settings, cleanSettingName, "b", value, NULL);
+	    }
+	}
+	break;
+    case TypeColor:
+	{
+	    CCSSettingColorValue value;
+	    char                 *colString;
+
+	    if (!ccsGetColor (setting, &value))
+		break;
+
+	    colString = ccsColorToString (&value);
+	    if (!colString)
+		break;
+
+	    g_settings_set (settings, cleanSettingName, "s", colString, NULL);
+	    free (colString);
+	}
+	break;
+    case TypeKey:
+	{
+	    CCSSettingKeyValue key;
+	    char               *keyString;
+
+	    if (!ccsGetKey (setting, &key))
+		break;
+
+	    keyString = ccsKeyBindingToString (&key);
+	    if (!keyString)
+		break;
+
+	    g_settings_set (settings, cleanSettingName, "s", keyString, NULL);
+	    free (keyString);
+	}
+	break;
+    case TypeButton:
+	{
+	    CCSSettingButtonValue button;
+	    char                  *buttonString;
+
+	    if (!ccsGetButton (setting, &button))
+		break;
+
+	    buttonString = ccsButtonBindingToString (&button);
+	    if (!buttonString)
+		break;
+
+	    g_settings_set (settings, cleanSettingName, "s", buttonString, NULL);
+	    free (buttonString);
+	}
+	break;
+    case TypeEdge:
+	{
+	    unsigned int edges;
+	    char         *edgeString;
+
+	    if (!ccsGetEdge (setting, &edges))
+		break;
+
+	    edgeString = ccsEdgesToString (edges);
+	    if (!edgeString)
+		break;
+
+	    g_settings_set (settings, cleanSettingName, "s", edgeString, NULL);
+	    free (edgeString);
+	}
+	break;
+    case TypeBell:
+	{
+	    Bool value;
+	    if (ccsGetBell (setting, &value))
+	    {
+		g_settings_set (settings, cleanSettingName, "s", value, NULL);
+	    }
+	}
+	break;
+    case TypeList:
+	writeListValue (setting, pathName);
+	break;
+    default:
+	printf("GSettings backend: attempt to write unsupported setting type %d\n",
+	       setting->type);
+	break;
+    }
+
+    free (cleanSettingName);
+}
+
+static void
+updateCurrentProfileName (char *profile)
+{
+    GVariant        *profiles;
+    char	    *prof;
+    char	    *profilePath = COMPIZ_PROFILEPATH;
+    char	    *currentProfilePath;
+    GVariant        *newProfiles;
+    GVariantBuilder *newProfilesBuilder;
+    GVariantIter    *iter;
+    gboolean        found = FALSE;
+
+    profiles = g_settings_get_value (compizconfigSettings, "existing-profiles");
+
+    newProfilesBuilder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+
+    iter = g_variant_iter_new (profiles);
+    while (g_variant_iter_next (iter, "s", &prof))
+    {
+	g_variant_builder_add (newProfilesBuilder, "s", prof);
+
+	if (!found)
+	    found = (g_strcmp0 (prof, profile) == 0);
+    }
+
+    if (!found)
+	g_variant_builder_add (newProfilesBuilder, "s", profile);
+
+    newProfiles = g_variant_new ("as", newProfilesBuilder);
+    g_settings_set_value (compizconfigSettings, "existing-profiles", newProfiles);
+
+    g_variant_iter_free (iter);
+    g_variant_unref (newProfiles);
+    g_variant_builder_unref (newProfilesBuilder);
+
+    /* Change the current profile and current profile settings */
+    free (currentProfile);
+
+    currentProfile = strdup (profile);
+    currentProfilePath = g_strconcat (profilePath, profile, "/", NULL);
+    currentProfileSettings = g_settings_new_with_path (PROFILE_SCHEMA_ID, profilePath);
+
+    g_free (currentProfilePath);
+
+    g_settings_set (compizconfigSettings, "current-profile", "s", profile, NULL);
+}
+
+static gboolean
+updateProfile (CCSContext *context)
+{
+    char *profile = strdup (ccsGetProfile (context));
+
+    if (!profile || !strlen (profile))
+	profile = strdup (DEFAULTPROF);
+
+    if (g_strcmp0 (profile, currentProfile))
+	updateCurrentProfileName (profile);
+
+    free (profile);
+
+    return TRUE;
+}
+
+static char*
+getCurrentProfileName (void)
+{
+    GVariant *value;
+    char     *ret = NULL;
+
+    value = g_settings_get_value (compizconfigSettings, "current-profile");
+
+    if (value)
+	ret = strdup (g_variant_get_string (value, NULL));
+    else
+	ret = strdup (DEFAULTPROF);
+
+    return ret;
+}
+
+static void
+processEvents (unsigned int flags)
+{
+    if (!(flags & ProcessEventsNoGlibMainLoopMask))
+    {
+	while (g_main_context_pending(NULL))
+	    g_main_context_iteration(NULL, FALSE);
+    }
+}
+
+static Bool
+initBackend (CCSContext * context)
+{
+    const char *profilePath = PROFILEPATH;
+    char       *currentProfilePath;
+
+    g_type_init ();
+
+    compizconfigSettings = g_settings_new (COMPIZCONFIG_SCHEMA_ID);
+
+#ifdef USE_GCONF
+    initGConfClient (context);
+#endif
+
+    currentProfile = getCurrentProfileName ();
+    currentProfilePath = g_strconcat (profilePath, currentProfile, "/", NULL);
+    currentProfileSettings = g_settings_new_with_path (PROFILE_SCHEMA_ID, currentProfilePath);
+
+    g_free (currentProfilePath);
+
+    return TRUE;
+}
+
+static Bool
+finiBackend (CCSContext * context)
+{
+    GList *l = settingsList;
+
+    processEvents (0);
+
+#ifdef USE_GCONF
+    gconf_client_clear_cache (client);
+    finiGConfClient ();
+#endif
+
+    if (currentProfile)
+    {
+	free (currentProfile);
+	currentProfile = NULL;
+    }
+
+    while (l)
+    {
+	g_object_unref (G_OBJECT (l->data));
+	l = g_list_next (l);
+    }
+
+    g_object_unref (G_OBJECT (compizconfigSettings));
+
+    processEvents (0);
+    return TRUE;
+}
+
+Bool
+readInit (CCSContext * context)
+{
+    return updateProfile (context);
+}
+
+void
+readSetting (CCSContext *context,
+	     CCSSetting *setting)
+{
+    Bool status;
+    int  index;
+
+    if (ccsGetIntegrationEnabled (context) &&
+	isIntegratedOption (setting, &index))
+    {
+	status = readIntegratedOption (context, setting, index);
+    }
+    else
+	status = readOption (setting);
+
+    if (!status)
+	ccsResetToDefault (setting, TRUE);
+}
+
+Bool
+writeInit (CCSContext * context)
+{
+    return updateProfile (context);
+}
+
+void
+writeSetting (CCSContext *context,
+	      CCSSetting *setting)
+{
+    int index;
+
+    if (ccsGetIntegrationEnabled (context) &&
+	isIntegratedOption (setting, &index))
+    {
+	writeIntegratedOption (context, setting, index);
+    }
+    else if (setting->isDefault)
+    {
+	resetOptionToDefault (setting);
+    }
+    else
+	writeOption (setting);
+
+}
+
+static Bool
+getSettingIsIntegrated (CCSSetting * setting)
+{
+    if (!ccsGetIntegrationEnabled (setting->parent->context))
+	return FALSE;
+
+    if (!isIntegratedOption (setting, NULL))
+	return FALSE;
+
+    return TRUE;
+}
+
+static Bool
+getSettingIsReadOnly (CCSSetting * setting)
+{
+    /* FIXME */
+    return FALSE;
+}
+
+static CCSStringList
+getExistingProfiles (CCSContext *context)
+{
+    GVariant      *value;
+    char	  *profile;
+    GVariantIter  iter;
+    CCSStringList ret = NULL;
+
+    value = g_settings_get_value (compizconfigSettings,  "existing-profiles");
+    g_variant_iter_init (&iter, value);
+    while (g_variant_iter_next (&iter, "s", &profile))
+    {
+	CCSString *str = malloc (sizeof (CCSString));
+
+	str->value = profile;
+
+	ret = ccsStringListAppend (ret, str);
+    }
+
+    g_variant_unref (value);
+
+    return ret;
+}
+
+static Bool
+deleteProfile (CCSContext *context,
+	       char       *profile)
+{
+    GVariant        *plugins;
+    GVariant        *profiles;
+    GVariant        *newProfiles;
+    GVariantBuilder *newProfilesBuilder;
+    char            *plugin, *prof;
+    GVariantIter    *iter;
+    char            *profileSettingsPath = g_strconcat (PROFILEPATH, profile, "/", NULL);
+    GSettings       *profileSettings = g_settings_new_with_path (PROFILE_SCHEMA_ID, profileSettingsPath);
+
+    plugins = g_settings_get_value (currentProfileSettings, "plugins-with-set-keys");
+    profiles = g_settings_get_value (compizconfigSettings, "existing-profiles");
+
+    iter = g_variant_iter_new (plugins);
+    while (g_variant_iter_next (iter, "s", &plugin))
+    {
+	GSettings *settings;
+
+	KEYNAME (context->screenNum);
+	PATHNAME (plugin, keyName);
+
+	settings = getSettingsObjectForPluginWithPath (plugin, pathName, context);
+
+	/* The GSettings documentation says not to use this API
+	 * because we should know our own schema ... though really
+	 * we don't because we autogenerate schemas ... */
+	if (settings)
+	{
+	    char **keys = g_settings_list_keys (settings);
+	    char **key_ptr;
+
+	    /* Unset all the keys */
+	    for (key_ptr = keys; *key_ptr; key_ptr++)
+		g_settings_reset (settings, *key_ptr);
+
+	    g_strfreev (keys);
+	}
+
+	g_free (plugin);
+    }
+
+    /* Remove the profile from existing-profiles */
+    g_variant_iter_free (iter);
+    g_settings_reset (profileSettings, "plugins-with-set-values");
+
+    iter = g_variant_iter_new (profiles);
+    newProfilesBuilder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+
+    while (g_variant_iter_next (iter, "s", &prof))
+    {
+	if (g_strcmp0 (prof, profile))
+	    g_variant_builder_add (newProfilesBuilder, "s", prof);
+
+	g_free (prof);
+    }
+
+    newProfiles = g_variant_new ("as", newProfilesBuilder);
+    g_settings_set_value (compizconfigSettings, "existing-profiles", newProfiles);
+
+    g_variant_unref (newProfiles);
+    g_variant_builder_unref (newProfilesBuilder);
+
+    free (profileSettingsPath);
+
+    updateProfile (context);
+
+    return TRUE;
+}
+
+static CCSBackendVTable gsettingsVTable = {
+    "gsettings",
+    "GSettings Configuration Backend",
+    "GSettings Configuration Backend for libccs",
+    TRUE,
+    TRUE,
+    processEvents,
+    initBackend,
+    finiBackend,
+    readInit,
+    readSetting,
+    0,
+    writeInit,
+    writeSetting,
+    0,
+    getSettingIsIntegrated,
+    getSettingIsReadOnly,
+    getExistingProfiles,
+    deleteProfile
+};
+
+CCSBackendVTable *
+getBackendInfo (void)
+{
+    return &gsettingsVTable;
+}
+
+>>>>>>> MERGE-SOURCE