[cheese/gsettings-vala] Removed enable_delete option

[Yuvaraj Pandian <yuvipanda src gnome org>]

commit eaf0b0e10072ee74f38fac08fa82ebbd6e7da474
Author: Yuvaraj Pandian T <yuvipanda gmail com>
Date:   Fri Aug 6 20:02:41 2010 +0530

    Removed enable_delete option

 data/org.gnome.Cheese.gschema.xml |   31 -------------------------------
 libcheese/cheese-gconf.c          |    7 -------
 libcheese/cheese-gconf.h          |    3 +--
 3 files changed, 1 insertions(+), 40 deletions(-)
---
diff --git a/data/org.gnome.Cheese.gschema.xml b/data/org.gnome.Cheese.gschema.xml
index 8e23b1d..f8c5de4 100644
--- a/data/org.gnome.Cheese.gschema.xml
+++ b/data/org.gnome.Cheese.gschema.xml
@@ -16,27 +16,6 @@
       <default>''</default>
     </key>
 
-    <key name='selected-effects' type='as'>
-      <summary>Selected Effects</summary>
-      <description>
-        A list of effects applied on startup.
-      </description>
-      <choices>
-        <choice value='mauve'/>
-        <choice value='noir_blanc'/>
-        <choice value='saturation'/>
-        <choice value='hulk'/>
-        <choice value='vertical-flip'/>
-        <choice value='horizontal-flip'/>
-        <choice value='shagadelic'/>
-        <choice value='vertigo'/>
-        <choice value='edge'/>
-        <choice value='dice'/>
-        <choice value='warp'/>
-      </choices>
-      <default>[]</default>
-    </key>
-
     <key name='x-resolution' type='i'>
       <summary>Width resolution</summary>
       <description>
@@ -103,16 +82,6 @@
       <default>''</default>
     </key>
 
-    <key name='enable-delete' type='b'>
-      <summary>Whether to enable immediate deletion</summary>
-      <description>
-        If set to true, then Cheese will have a feature allowing you to
-        delete a file immediately and in-place, instead of moving it to
-        the trash. This feature can be dangerous, so use caution.
-      </description>
-      <default>false</default>
-    </key>
-
     <key name='wide-mode' type='b'>
       <summary>Whether to start in wide mode</summary>
       <description>
diff --git a/libcheese/cheese-gconf.c b/libcheese/cheese-gconf.c
index ca958f7..76cb9c8 100644
--- a/libcheese/cheese-gconf.c
+++ b/libcheese/cheese-gconf.c
@@ -96,10 +96,6 @@ cheese_gconf_get_property (GObject *object, guint prop_id, GValue *value,
       g_settings_get (priv->settings, "photo-path", "s", &temp_str);
       g_value_set_string (value, temp_str);
       break;
-    case GCONF_PROP_ENABLE_DELETE:
-      g_settings_get (priv->settings, "enable-delete", "b", &temp_bool);
-      g_value_set_boolean (value, temp_bool);
-      break;
     case GCONF_PROP_WIDE_MODE:
       g_settings_get (priv->settings, "wide-mode", "b", &temp_bool);
       g_value_set_boolean (value, temp_bool);
@@ -163,9 +159,6 @@ cheese_gconf_set_property (GObject *object, guint prop_id, const GValue *value,
     case GCONF_PROP_PHOTO_PATH:
       g_settings_set (priv->settings, "photo-path", "s", g_value_get_string (value));
       break;
-    case GCONF_PROP_ENABLE_DELETE:
-      g_settings_set (priv->settings, "enable-delete", "b", g_value_get_boolean (value));
-      break;
     case GCONF_PROP_WIDE_MODE:
       g_settings_set (priv->settings, "wide-mode", "b", g_value_get_boolean (value));
       break;
diff --git a/libcheese/cheese-gconf.h b/libcheese/cheese-gconf.h
index 9b9b308..f11dc1a 100644
--- a/libcheese/cheese-gconf.h
+++ b/libcheese/cheese-gconf.h
@@ -44,7 +44,7 @@ enum
   GCONF_PROP_0,
   GCONF_PROP_COUNTDOWN,
   GCONF_PROP_CAMERA,
-  GCONF_PROP_SELECTED_EFFECTS,
+  GCONF_PROP_SELECTED_EFFECT,
   GCONF_PROP_X_RESOLUTION,
   GCONF_PROP_Y_RESOLUTION,
   GCONF_PROP_BRIGHTNESS,
@@ -53,7 +53,6 @@ enum
   GCONF_PROP_HUE,
   GCONF_PROP_VIDEO_PATH,
   GCONF_PROP_PHOTO_PATH,
-  GCONF_PROP_ENABLE_DELETE,
   GCONF_PROP_WIDE_MODE,
   GCONF_PROP_BURST_DELAY,
   GCONF_PROP_BURST_REPEAT