From 29c2b827b09ba8138059a1c1e5db967ab2029ced Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Thu, 12 Jul 2012 08:50:26 +0200 Subject: Fix LU-26: make "name" a base property --- src/cameras/uca-pf-camera.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/cameras/uca-pf-camera.c') diff --git a/src/cameras/uca-pf-camera.c b/src/cameras/uca-pf-camera.c index 3bbd406..90f887b 100644 --- a/src/cameras/uca-pf-camera.c +++ b/src/cameras/uca-pf-camera.c @@ -62,6 +62,7 @@ GQuark uca_pf_camera_error_quark() } static gint base_overrideables[] = { + PROP_NAME, PROP_SENSOR_WIDTH, PROP_SENSOR_HEIGHT, PROP_SENSOR_BITDEPTH, @@ -81,12 +82,10 @@ static gint base_overrideables[] = { }; enum { - PROP_NAME = N_BASE_PROPERTIES, + PROP_FOO = N_BASE_PROPERTIES, N_PROPERTIES }; -static GParamSpec *pf_properties[N_PROPERTIES] = { NULL, }; - struct _UcaPfCameraPrivate { guint roi_width; @@ -337,15 +336,6 @@ static void uca_pf_camera_class_init(UcaPfCameraClass *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]]); - pf_properties[PROP_NAME] = - g_param_spec_string("name", - "Name of the camera", - "Name of the camera", - "", G_PARAM_READABLE); - - for (guint id = N_BASE_PROPERTIES; id < N_PROPERTIES; id++) - g_object_class_install_property(gobject_class, id, pf_properties[id]); - g_type_class_add_private(klass, sizeof(UcaPfCameraPrivate)); } -- cgit v1.2.3