[cheese/gsettings-vala] Removed gconf_prop_ prefix cruft



commit ba0a325a5795382510b2533a8b062b10cbfdb474
Author: Yuvaraj Pandian T <yuvipanda gmail com>
Date:   Sat Aug 7 02:30:59 2010 +0530

    Removed gconf_prop_ prefix cruft
    
    I feel like I just had a shower after 5 years

 libcheese/cheese-fileutil.c |    4 +-
 libcheese/cheese-gconf.c    |  120 +++++++++++++++++++++---------------------
 libcheese/cheese-gconf.h    |   32 ++++++------
 libcheese/cheese-widget.c   |   14 +++---
 src/cheese-preferences.vala |   30 +++++-----
 src/cheese-window.vala      |   30 +++++-----
 src/vapi/cheese-common.vapi |   30 +++++-----
 7 files changed, 130 insertions(+), 130 deletions(-)
---
diff --git a/libcheese/cheese-fileutil.c b/libcheese/cheese-fileutil.c
index 90acd26..d15dbf3 100644
--- a/libcheese/cheese-fileutil.c
+++ b/libcheese/cheese-fileutil.c
@@ -201,8 +201,8 @@ cheese_fileutil_init (CheeseFileUtil *fileutil)
 
   gconf = cheese_gconf_new ();
 
-  g_object_get (gconf, "gconf_prop_video_path", &priv->video_path, NULL);
-  g_object_get (gconf, "gconf_prop_photo_path", &priv->photo_path, NULL);
+  g_object_get (gconf, "video_path", &priv->video_path, NULL);
+  g_object_get (gconf, "photo_path", &priv->photo_path, NULL);
 
   /* get the video path from gconf, xdg or hardcoded */
   if (!priv->video_path || strcmp (priv->video_path, "") == 0)
diff --git a/libcheese/cheese-gconf.c b/libcheese/cheese-gconf.c
index ce8e186..fb6a61b 100644
--- a/libcheese/cheese-gconf.c
+++ b/libcheese/cheese-gconf.c
@@ -55,63 +55,63 @@ cheese_gconf_get_property (GObject *object, guint prop_id, GValue *value,
 
   switch (prop_id)
   {
-    case GCONF_PROP_COUNTDOWN:
+    case COUNTDOWN:
       g_settings_get (priv->settings, "countdown", "b", &temp_bool);
       g_value_set_boolean (value, temp_bool);
       break;
-  case GCONF_PROP_FLASH:
+  case FLASH:
       g_settings_get (priv->settings, "flash", "b", &temp_bool);
       g_value_set_boolean (value, temp_bool);
       break;
-    case GCONF_PROP_CAMERA:
+    case CAMERA:
       g_settings_get (priv->settings, "camera", "s", &temp_str);
       g_value_set_string (value, temp_str);
       break;
-  case GCONF_PROP_SELECTED_EFFECT:
+  case SELECTED_EFFECT:
       g_settings_get (priv->settings, "selected-effect", "s", &temp_str);
       g_value_set_string (value, temp_str);
       break;
-    case GCONF_PROP_X_RESOLUTION:
+    case X_RESOLUTION:
       g_settings_get (priv->settings, "x-resolution", "i", &temp_int);
       g_value_set_int (value, temp_int);
       break;
-    case GCONF_PROP_Y_RESOLUTION:
+    case Y_RESOLUTION:
       g_settings_get (priv->settings, "y-resolution", "i", &temp_int);
       g_value_set_int (value, temp_int);
       break;
-    case GCONF_PROP_BRIGHTNESS:
+    case BRIGHTNESS:
       g_settings_get (priv->settings, "brightness", "d", &temp_dbl);
       g_value_set_double (value, temp_dbl);
       break;
-    case GCONF_PROP_CONTRAST:
+    case CONTRAST:
       g_settings_get (priv->settings, "contrast", "d", &temp_dbl);
       g_value_set_double (value, temp_dbl);      
       break;
-    case GCONF_PROP_SATURATION:
+    case SATURATION:
       g_settings_get (priv->settings, "saturation", "d", &temp_dbl);
       g_value_set_double (value, temp_dbl);      
       break;
-    case GCONF_PROP_HUE:
+    case HUE:
       g_settings_get (priv->settings, "hue", "d", &temp_dbl);
       g_value_set_double (value, temp_dbl);      
       break;
-    case GCONF_PROP_VIDEO_PATH:
+    case VIDEO_PATH:
       g_settings_get (priv->settings, "video-path", "s", &temp_str);
       g_value_set_string (value, temp_str);
       break;
-    case GCONF_PROP_PHOTO_PATH:
+    case PHOTO_PATH:
       g_settings_get (priv->settings, "photo-path", "s", &temp_str);
       g_value_set_string (value, temp_str);
       break;
-    case GCONF_PROP_WIDE_MODE:
+    case WIDE_MODE:
       g_settings_get (priv->settings, "wide-mode", "b", &temp_bool);
       g_value_set_boolean (value, temp_bool);
       break;
-    case GCONF_PROP_BURST_DELAY:
+    case BURST_DELAY:
       g_settings_get (priv->settings, "burst-delay", "i", &temp_int);
       g_value_set_int (value, temp_int);
       break;
-    case GCONF_PROP_BURST_REPEAT:
+    case BURST_REPEAT:
       g_settings_get (priv->settings, "burst-repeat", "i", &temp_int);
       g_value_set_int (value, temp_int);
       break;
@@ -136,49 +136,49 @@ cheese_gconf_set_property (GObject *object, guint prop_id, const GValue *value,
 
   switch (prop_id)
   {
-    case GCONF_PROP_COUNTDOWN:
+    case COUNTDOWN:
       g_settings_set (priv->settings, "countdown", "b", g_value_get_boolean (value));
       break;
-  case GCONF_PROP_FLASH:
+  case FLASH:
       g_settings_set (priv->settings, "flash", "b", g_value_get_boolean (value));
       break;
-  case GCONF_PROP_CAMERA:
+  case CAMERA:
       g_settings_set (priv->settings, "camera", "s", g_value_get_string (value));
       break;
-  case GCONF_PROP_SELECTED_EFFECT:
+  case SELECTED_EFFECT:
       g_settings_set (priv->settings, "selected-effect", "s", g_value_get_string (value));
       break;
-    case GCONF_PROP_X_RESOLUTION:
+    case X_RESOLUTION:
       g_settings_set (priv->settings, "x-resolution", "i", g_value_get_int (value));
       break;
-    case GCONF_PROP_Y_RESOLUTION:
+    case Y_RESOLUTION:
       g_settings_set (priv->settings, "y-resolution", "i", g_value_get_int (value));
       break;
-    case GCONF_PROP_BRIGHTNESS:
+    case BRIGHTNESS:
       g_settings_set (priv->settings, "brightness", "d", g_value_get_double (value));
       break;
-    case GCONF_PROP_CONTRAST:
+    case CONTRAST:
       g_settings_set (priv->settings, "contrast", "d", g_value_get_double (value));
       break;
-    case GCONF_PROP_SATURATION:
+    case SATURATION:
       g_settings_set (priv->settings, "saturation", "d", g_value_get_double (value));
       break;
-    case GCONF_PROP_HUE:
+    case HUE:
       g_settings_set (priv->settings, "hue", "d", g_value_get_double (value));
       break;
-    case GCONF_PROP_VIDEO_PATH:
+    case VIDEO_PATH:
       g_settings_set (priv->settings, "video-path", "s", g_value_get_string (value));
       break;
-    case GCONF_PROP_PHOTO_PATH:
+    case PHOTO_PATH:
       g_settings_set (priv->settings, "photo-path", "s", g_value_get_string (value));
       break;
-    case GCONF_PROP_WIDE_MODE:
+    case WIDE_MODE:
       g_settings_set (priv->settings, "wide-mode", "b", g_value_get_boolean (value));
       break;
-    case GCONF_PROP_BURST_DELAY:
+    case BURST_DELAY:
       g_settings_set (priv->settings, "burst-delay", "i", g_value_get_int (value));
       break;
-    case GCONF_PROP_BURST_REPEAT:
+    case BURST_REPEAT:
       g_settings_set (priv->settings, "burst-repeat", "i", g_value_get_int (value));
       break;
     default:
@@ -209,34 +209,34 @@ cheese_gconf_class_init (CheeseGConfClass *klass)
   object_class->get_property = cheese_gconf_get_property;
   object_class->set_property = cheese_gconf_set_property;
 
-  g_object_class_install_property (object_class, GCONF_PROP_COUNTDOWN,
-                                   g_param_spec_boolean ("gconf_prop_countdown",
+  g_object_class_install_property (object_class, COUNTDOWN,
+                                   g_param_spec_boolean ("countdown",
                                                          NULL,
                                                          NULL,
                                                          FALSE,
                                                          G_PARAM_READWRITE));
-  g_object_class_install_property (object_class, GCONF_PROP_FLASH,
-                                   g_param_spec_boolean ("gconf_prop_flash",
+  g_object_class_install_property (object_class, FLASH,
+                                   g_param_spec_boolean ("flash",
                                                          NULL,
                                                          NULL,
                                                          FALSE,
                                                          G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_CAMERA,
-                                   g_param_spec_string ("gconf_prop_camera",
+  g_object_class_install_property (object_class, CAMERA,
+                                   g_param_spec_string ("camera",
                                                         NULL,
                                                         NULL,
                                                         "",
                                                         G_PARAM_READWRITE));
-  g_object_class_install_property (object_class, GCONF_PROP_SELECTED_EFFECT,
-                                   g_param_spec_string ("gconf_prop_selected_effect",
+  g_object_class_install_property (object_class, SELECTED_EFFECT,
+                                   g_param_spec_string ("selected_effect",
                                                         NULL,
                                                         NULL,
                                                         "identity",
                                                         G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_X_RESOLUTION,
-                                   g_param_spec_int ("gconf_prop_x_resolution",
+  g_object_class_install_property (object_class, X_RESOLUTION,
+                                   g_param_spec_int ("x_resolution",
                                                      NULL,
                                                      NULL,
                                                      0,
@@ -244,8 +244,8 @@ cheese_gconf_class_init (CheeseGConfClass *klass)
                                                      0,
                                                      G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_Y_RESOLUTION,
-                                   g_param_spec_int ("gconf_prop_y_resolution",
+  g_object_class_install_property (object_class, Y_RESOLUTION,
+                                   g_param_spec_int ("y_resolution",
                                                      NULL,
                                                      NULL,
                                                      0,
@@ -253,8 +253,8 @@ cheese_gconf_class_init (CheeseGConfClass *klass)
                                                      0,
                                                      G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_BRIGHTNESS,
-                                   g_param_spec_double ("gconf_prop_brightness",
+  g_object_class_install_property (object_class, BRIGHTNESS,
+                                   g_param_spec_double ("brightness",
                                                         NULL,
                                                         NULL,
                                                         -G_MAXFLOAT,
@@ -262,8 +262,8 @@ cheese_gconf_class_init (CheeseGConfClass *klass)
                                                         0.0,
                                                         G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_CONTRAST,
-                                   g_param_spec_double ("gconf_prop_contrast",
+  g_object_class_install_property (object_class, CONTRAST,
+                                   g_param_spec_double ("contrast",
                                                         NULL,
                                                         NULL,
                                                         0,
@@ -271,8 +271,8 @@ cheese_gconf_class_init (CheeseGConfClass *klass)
                                                         1.0,
                                                         G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_SATURATION,
-                                   g_param_spec_double ("gconf_prop_saturation",
+  g_object_class_install_property (object_class, SATURATION,
+                                   g_param_spec_double ("saturation",
                                                         NULL,
                                                         NULL,
                                                         0,
@@ -280,8 +280,8 @@ cheese_gconf_class_init (CheeseGConfClass *klass)
                                                         1.0,
                                                         G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_HUE,
-                                   g_param_spec_double ("gconf_prop_hue",
+  g_object_class_install_property (object_class, HUE,
+                                   g_param_spec_double ("hue",
                                                         NULL,
                                                         NULL,
                                                         -G_MAXFLOAT,
@@ -289,29 +289,29 @@ cheese_gconf_class_init (CheeseGConfClass *klass)
                                                         0.0,
                                                         G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_VIDEO_PATH,
-                                   g_param_spec_string ("gconf_prop_video_path",
+  g_object_class_install_property (object_class, VIDEO_PATH,
+                                   g_param_spec_string ("video_path",
                                                         NULL,
                                                         NULL,
                                                         "",
                                                         G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_PHOTO_PATH,
-                                   g_param_spec_string ("gconf_prop_photo_path",
+  g_object_class_install_property (object_class, PHOTO_PATH,
+                                   g_param_spec_string ("photo_path",
                                                         NULL,
                                                         NULL,
                                                         "",
                                                         G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_WIDE_MODE,
-                                   g_param_spec_boolean ("gconf_prop_wide_mode",
+  g_object_class_install_property (object_class, WIDE_MODE,
+                                   g_param_spec_boolean ("wide_mode",
                                                          NULL,
                                                          NULL,
                                                          FALSE,
                                                          G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_BURST_DELAY,
-                                   g_param_spec_int ("gconf_prop_burst_delay",
+  g_object_class_install_property (object_class, BURST_DELAY,
+                                   g_param_spec_int ("burst_delay",
                                                      NULL,
                                                      NULL,
                                                      200,  /* based on some experiments */
@@ -319,8 +319,8 @@ cheese_gconf_class_init (CheeseGConfClass *klass)
                                                      1000,
                                                      G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, GCONF_PROP_BURST_REPEAT,
-                                   g_param_spec_int ("gconf_prop_burst_repeat",
+  g_object_class_install_property (object_class, BURST_REPEAT,
+                                   g_param_spec_int ("burst_repeat",
                                                      NULL,
                                                      NULL,
                                                      1,
diff --git a/libcheese/cheese-gconf.h b/libcheese/cheese-gconf.h
index 8b132fc..d301f73 100644
--- a/libcheese/cheese-gconf.h
+++ b/libcheese/cheese-gconf.h
@@ -41,22 +41,22 @@ typedef struct
 
 enum
 {
-  GCONF_PROP_0,
-  GCONF_PROP_COUNTDOWN,
-  GCONF_PROP_CAMERA,
-  GCONF_PROP_FLASH,
-  GCONF_PROP_SELECTED_EFFECT,
-  GCONF_PROP_X_RESOLUTION,
-  GCONF_PROP_Y_RESOLUTION,
-  GCONF_PROP_BRIGHTNESS,
-  GCONF_PROP_CONTRAST,
-  GCONF_PROP_SATURATION,
-  GCONF_PROP_HUE,
-  GCONF_PROP_VIDEO_PATH,
-  GCONF_PROP_PHOTO_PATH,
-  GCONF_PROP_WIDE_MODE,
-  GCONF_PROP_BURST_DELAY,
-  GCONF_PROP_BURST_REPEAT
+  GCONF_PROP_0, 
+  COUNTDOWN,
+  CAMERA,
+  FLASH,
+  SELECTED_EFFECT,
+  X_RESOLUTION,
+  Y_RESOLUTION,
+  BRIGHTNESS,
+  CONTRAST,
+  SATURATION,
+  HUE,
+  VIDEO_PATH,
+  PHOTO_PATH,
+  WIDE_MODE,
+  BURST_DELAY,
+  BURST_REPEAT
 };
 
 GType        cheese_gconf_get_type (void);
diff --git a/libcheese/cheese-widget.c b/libcheese/cheese-widget.c
index d61b956..a5256c6 100644
--- a/libcheese/cheese-widget.c
+++ b/libcheese/cheese-widget.c
@@ -303,13 +303,13 @@ setup_camera (CheeseWidget *widget)
   gdouble              hue;
 
   g_object_get (priv->gconf,
-                "gconf_prop_x_resolution", &x_resolution,
-                "gconf_prop_y_resolution", &y_resolution,
-                "gconf_prop_camera", &webcam_device,
-                "gconf_prop_brightness", &brightness,
-                "gconf_prop_contrast", &contrast,
-                "gconf_prop_saturation", &saturation,
-                "gconf_prop_hue", &hue,
+                "x_resolution", &x_resolution,
+                "y_resolution", &y_resolution,
+                "camera", &webcam_device,
+                "brightness", &brightness,
+                "contrast", &contrast,
+                "saturation", &saturation,
+                "hue", &hue,
                 NULL);
 
   gdk_threads_enter ();
diff --git a/src/cheese-preferences.vala b/src/cheese-preferences.vala
index 588342b..b9f6e42 100644
--- a/src/cheese-preferences.vala
+++ b/src/cheese-preferences.vala
@@ -148,13 +148,13 @@ public class Cheese.PreferencesDialog : GLib.Object
 
   private void initialize_values_from_conf ()
   {
-    brightness_adjustment.value = conf.gconf_prop_brightness;
-    contrast_adjustment.value   = conf.gconf_prop_contrast;
-    hue_adjustment.value        = conf.gconf_prop_hue;
-    saturation_adjustment.value = conf.gconf_prop_saturation;
+    brightness_adjustment.value = conf.brightness;
+    contrast_adjustment.value   = conf.contrast;
+    hue_adjustment.value        = conf.hue;
+    saturation_adjustment.value = conf.saturation;
 
-    burst_repeat_spin.value = conf.gconf_prop_burst_repeat;
-    burst_delay_spin.value  = conf.gconf_prop_burst_delay / 1000;
+    burst_repeat_spin.value = conf.burst_repeat;
+    burst_delay_spin.value  = conf.burst_delay / 1000;
   }
 
   [CCode (instance_pos = -1)]
@@ -169,7 +169,7 @@ public class Cheese.PreferencesDialog : GLib.Object
     camera.set_device_by_dev_file (dev.get_device_file ());
     camera.switch_camera_device ();
     setup_resolutions_for_device (camera.get_selected_device ());
-    conf.gconf_prop_camera = dev.get_device_file ();
+    conf.camera = dev.get_device_file ();
   }
 
   [CCode (instance_pos = -1)]
@@ -183,8 +183,8 @@ public class Cheese.PreferencesDialog : GLib.Object
     combo.model.get (iter, 1, out format);
     camera.set_video_format (format);
 
-    conf.gconf_prop_x_resolution = format.width;
-    conf.gconf_prop_y_resolution = format.height;
+    conf.x_resolution = format.width;
+    conf.y_resolution = format.height;
   }
 
   [CCode (instance_pos = -1)]
@@ -196,41 +196,41 @@ public class Cheese.PreferencesDialog : GLib.Object
   [CCode (instance_pos = -1)]
   public void on_burst_repeat_change (Gtk.SpinButton spinbutton)
   {
-    conf.gconf_prop_burst_repeat = (int) spinbutton.value;
+    conf.burst_repeat = (int) spinbutton.value;
   }
 
   [CCode (instance_pos = -1)]
   public void on_burst_delay_change (Gtk.SpinButton spinbutton)
   {
-    conf.gconf_prop_burst_delay = (int) spinbutton.value * 1000;
+    conf.burst_delay = (int) spinbutton.value * 1000;
   }
 
   [CCode (instance_pos = -1)]
   public void on_brightness_change (Gtk.Adjustment adjustment)
   {
     this.camera.set_balance_property ("brightness", adjustment.value);
-    conf.gconf_prop_brightness = adjustment.value;
+    conf.brightness = adjustment.value;
   }
 
   [CCode (instance_pos = -1)]
   public void on_contrast_change (Gtk.Adjustment adjustment)
   {
     this.camera.set_balance_property ("contrast", adjustment.value);
-    conf.gconf_prop_contrast = adjustment.value;
+    conf.contrast = adjustment.value;
   }
 
   [CCode (instance_pos = -1)]
   public void on_hue_change (Gtk.Adjustment adjustment)
   {
     this.camera.set_balance_property ("hue", adjustment.value);
-    conf.gconf_prop_hue = adjustment.value;
+    conf.hue = adjustment.value;
   }
 
   [CCode (instance_pos = -1)]
   public void on_saturation_change (Gtk.Adjustment adjustment)
   {
     this.camera.set_balance_property ("saturation", adjustment.value);
-    conf.gconf_prop_saturation = adjustment.value;
+    conf.saturation = adjustment.value;
   }
 
   public void show ()
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index 9c65ba1..34afa69 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -482,7 +482,7 @@ public class Cheese.MainWindow : Gtk.Window
   private void set_wide_mode (bool wide_mode)
   {
     is_wide_mode              = wide_mode;
-    conf.gconf_prop_wide_mode = wide_mode;
+    conf.wide_mode = wide_mode;
 
     /* keep the viewport to its current size while rearranging the ui,
      * so that thumbview moves from right to bottom and viceversa
@@ -542,14 +542,14 @@ public class Cheese.MainWindow : Gtk.Window
   [CCode (instance_pos = -1)]
   public void on_countdown_toggle (ToggleAction action)
   {
-    conf.gconf_prop_countdown = action.active;
+    conf.countdown = action.active;
   }
 
   private void finish_countdown_callback ()
   {
     string file_name = fileutil.get_new_media_filename (this.current_mode);
 
-	if (conf.gconf_prop_flash)
+	if (conf.flash)
 	{
 		this.flash.fire ();
 	}
@@ -558,7 +558,7 @@ public class Cheese.MainWindow : Gtk.Window
 
   public void take_photo ()
   {
-    if (conf.gconf_prop_countdown)
+    if (conf.countdown)
     {
       Countdown cd = new Countdown (this.countdown_layer);
       cd.start_countdown (finish_countdown_callback);
@@ -573,7 +573,7 @@ public class Cheese.MainWindow : Gtk.Window
 
   private bool burst_take_photo ()
   {
-    if (is_bursting && burst_count < conf.gconf_prop_burst_repeat)
+    if (is_bursting && burst_count < conf.burst_repeat)
     {
       this.take_photo ();
       burst_count++;
@@ -630,7 +630,7 @@ public class Cheese.MainWindow : Gtk.Window
       burst_take_photo ();
 
       /* 3500 ms is approximate time for countdown animation to finish */
-      GLib.Timeout.add ((conf.gconf_prop_burst_delay / 1000) * 3500, burst_take_photo);
+      GLib.Timeout.add ((conf.burst_delay / 1000) * 3500, burst_take_photo);
     }
   }
 
@@ -650,7 +650,7 @@ public class Cheese.MainWindow : Gtk.Window
   {
     selected_effect = event.source.get_data ("effect");
     camera.set_effect (selected_effect);
-	conf.gconf_prop_selected_effect = selected_effect.name;
+	conf.selected_effect = selected_effect.name;
     effects_toggle_action.set_active (false);
     return false;
   }
@@ -917,11 +917,11 @@ public class Cheese.MainWindow : Gtk.Window
 
     /* call set_active instead of our set_wide_mode so that the toggle
      * action state is updated */
-    wide_mode_action.set_active (conf.gconf_prop_wide_mode);
+    wide_mode_action.set_active (conf.wide_mode);
 
     /* apparently set_active doesn't emit toggled nothing has
      * changed, do it manually */
-    if (!conf.gconf_prop_wide_mode) wide_mode_action.toggled ();
+    if (!conf.wide_mode) wide_mode_action.toggled ();
 
 
     set_mode (MediaMode.PHOTO);
@@ -931,12 +931,12 @@ public class Cheese.MainWindow : Gtk.Window
   public void setup_camera ()
   {
     camera = new Camera (video_preview,
-                         conf.gconf_prop_camera,
-                         conf.gconf_prop_x_resolution,
-                         conf.gconf_prop_y_resolution);
+                         conf.camera,
+                         conf.x_resolution,
+                         conf.y_resolution);
 
     try {
-      camera.setup (conf.gconf_prop_camera);
+      camera.setup (conf.camera);
     }
     catch (Error err)
     {
@@ -981,12 +981,12 @@ public class Cheese.MainWindow : Gtk.Window
       return;
     }	
 
-	Cheese.Effect selected_effect = effects_manager.get_effect (conf.gconf_prop_selected_effect);
+	Cheese.Effect selected_effect = effects_manager.get_effect (conf.selected_effect);
 	if (selected_effect != null)
 	{
 		camera.set_effect (selected_effect);
 	}
-	debug("%s", conf.gconf_prop_selected_effect);
+	debug("%s", conf.selected_effect);
 
     camera.play ();
   }
diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi
index 097a8af..d5abf6f 100644
--- a/src/vapi/cheese-common.vapi
+++ b/src/vapi/cheese-common.vapi
@@ -121,35 +121,35 @@ namespace Cheese
     [CCode (has_construct_function = false)]
     public GConf ();
     [NoAccessorMethod]
-    public double gconf_prop_brightness {get; set;}
+    public double brightness {get; set;}
     [NoAccessorMethod]
-    public int gconf_prop_burst_delay {get; set;}
+    public int burst_delay {get; set;}
     [NoAccessorMethod]
-    public int gconf_prop_burst_repeat {get; set;}
+    public int burst_repeat {get; set;}
     [NoAccessorMethod]
-    public string gconf_prop_camera {owned get; set;}
+    public string camera {owned get; set;}
     [NoAccessorMethod]
-    public double gconf_prop_contrast {get; set;}
+    public double contrast {get; set;}
     [NoAccessorMethod]
-    public bool gconf_prop_countdown {get; set;}
+    public bool countdown {get; set;}
     [NoAccessorMethod]
-	public bool gconf_prop_flash {get; set;}
+	public bool flash {get; set;}
     [NoAccessorMethod]
-    public double gconf_prop_hue {get; set;}
+    public double hue {get; set;}
     [NoAccessorMethod]
-    public string gconf_prop_photo_path {owned get; set;}
+    public string photo_path {owned get; set;}
     [NoAccessorMethod]
-    public double gconf_prop_saturation {get; set;}
+    public double saturation {get; set;}
     [NoAccessorMethod]
-    public string gconf_prop_selected_effect {owned get; set;}
+    public string selected_effect {owned get; set;}
     [NoAccessorMethod]
-    public string gconf_prop_video_path {owned get; set;}
+    public string video_path {owned get; set;}
     [NoAccessorMethod]
-    public bool gconf_prop_wide_mode {get; set;}
+    public bool wide_mode {get; set;}
     [NoAccessorMethod]
-    public int gconf_prop_x_resolution {get; set;}
+    public int x_resolution {get; set;}
     [NoAccessorMethod]
-    public int gconf_prop_y_resolution {get; set;}
+    public int y_resolution {get; set;}
   }
 
   [Compact]



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]