Merge lp:~compiz-team/compiz-compizconfig-gconf/compiz-compizconfig-gconf.fix_802373 into lp:compiz-compizconfig-gconf/trunk

[Sam Spilsbury]

[Neil J. Patel (njpatel)]

Looks good, approved!

review: Approve

=== modified file 'src/gconf.c'
--- src/gconf.c	2010-12-10 13:52:54 +0000
+++ src/gconf.c	2011-06-27 07:24:33 +0000
@@ -98,6 +98,7 @@
     OptionInt,
     OptionBool,
     OptionKey,
+    OptionBell,
     OptionString,
     OptionSpecial,
 } SpecialOptionType;
@@ -167,7 +168,7 @@
      METACITY "/general/resize_with_right_button", OptionSpecial},
 
     {"visual_bell", "fade", TRUE,
-     METACITY "/general/visual_bell", OptionBool},
+     METACITY "/general/visual_bell", OptionBell},
     {"fullscreen_visual_bell", "fade", TRUE,
      METACITY "/general/visual_bell_type", OptionSpecial},
 
@@ -1001,6 +1002,16 @@
 	    ret = TRUE;
 	}
 	break;
+    case OptionBell:
+	if (gconfValue->type == GCONF_VALUE_BOOL)
+	{
+	    gboolean value;
+
+	    value = gconf_value_get_bool (gconfValue);
+	    ccsSetBell (setting, value ? TRUE : FALSE);
+	    ret = TRUE;
+	}
+	break;
     case OptionString:
 	if (gconfValue->type == GCONF_VALUE_STRING)
 	{
@@ -1518,6 +1529,20 @@
 				       newValue, NULL);
 	}
 	break;
+    case OptionBell:
+	{
+	    Bool     newValue;
+	    gboolean currentValue;
+	    if (!ccsGetBell (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;