From 29c2b827b09ba8138059a1c1e5db967ab2029ced Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Thu, 12 Jul 2012 08:50:26 +0200
Subject: Fix LU-26: make "name" a base property

---
 src/cameras/uca-ufo-camera.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/cameras/uca-ufo-camera.c')

diff --git a/src/cameras/uca-ufo-camera.c b/src/cameras/uca-ufo-camera.c
index de8b128..347f3c1 100644
--- a/src/cameras/uca-ufo-camera.c
+++ b/src/cameras/uca-ufo-camera.c
@@ -54,12 +54,12 @@ GQuark uca_ufo_camera_error_quark()
 }
 
 enum {
-    PROP_NAME = N_BASE_PROPERTIES,
-    PROP_UFO_START,
+    PROP_UFO_START = N_BASE_PROPERTIES,
     N_MAX_PROPERTIES = 512
 };
 
 static gint base_overrideables[] = {
+    PROP_NAME,
     PROP_SENSOR_WIDTH,
     PROP_SENSOR_HEIGHT,
     PROP_SENSOR_HORIZONTAL_BINNING,
@@ -389,12 +389,6 @@ static void uca_ufo_camera_class_init(UcaUfoCameraClass *klass)
     for (guint i = 0; base_overrideables[i] != 0; i++)
         g_object_class_override_property(gobject_class, base_overrideables[i], uca_camera_props[base_overrideables[i]]);
 
-    ufo_properties[PROP_NAME] = 
-        g_param_spec_string("name",
-            "Name of the camera",
-            "Name of the camera",
-            "", G_PARAM_READABLE);
-
     /*
      * This automatic property installation includes the properties created 
      * dynamically in uca_ufo_camera_new().
-- 
cgit v1.2.3