gnome-scan r746 - in trunk: . lib modules/gsane

[bersace svn gnome org]

Author: bersace
Date: Thu Dec 25 17:34:34 2008
New Revision: 746
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=746&view=rev

Log:
Drop workaround for vala struct property handling.

Modified:
   trunk/ChangeLog
   trunk/lib/gnome-scan-combo-box-widget.vala
   trunk/lib/gnome-scan-option.vala
   trunk/modules/gsane/gsane-option-source.c

Modified: trunk/lib/gnome-scan-combo-box-widget.vala
==============================================================================
--- trunk/lib/gnome-scan-combo-box-widget.vala	(original)
+++ trunk/lib/gnome-scan-combo-box-widget.vala	Thu Dec 25 17:34:34 2008
@@ -61,7 +61,7 @@
 			}
 
 			combo.notify["active"] += this.on_combo_changed;
-			option.changed += this.on_option_changed;
+			option.notify["value"] += this.on_option_changed;
 
 			// don't show one option selector. Thanks Philipp for
 			// pointing that.

Modified: trunk/lib/gnome-scan-option.vala
==============================================================================
--- trunk/lib/gnome-scan-option.vala	(original)
+++ trunk/lib/gnome-scan-option.vala	Thu Dec 25 17:34:34 2008
@@ -126,16 +126,7 @@
 	}
 
 	public class OptionEnum : Option {
-		private weak Gnome.Scan.EnumValue? _value;
-		public weak Gnome.Scan.EnumValue? value {
-			get {
-				return this._value;
-			}
-			set {
-				this._value = value;
-				this.changed();
-			}
-		}
+		public weak Gnome.Scan.EnumValue? value {set; get;}
 
 		private weak SList<Gnome.Scan.EnumValue?> _values;
 		public weak SList<Gnome.Scan.EnumValue?> values {

Modified: trunk/modules/gsane/gsane-option-source.c
==============================================================================
--- trunk/modules/gsane/gsane-option-source.c	(original)
+++ trunk/modules/gsane/gsane-option-source.c	Thu Dec 25 17:34:34 2008
@@ -100,7 +100,7 @@
 };
 
 static void
-gsane_option_source_option_changed(GSaneOptionSource* self, GObject* option)
+gsane_option_source_option_changed(GSaneOptionSource* self, GParamSpec *pspec, GObject* option)
 {
 	GnomeScanEnumValue *evalue = NULL;
 	gnome_scan_option_enum_get_value(GNOME_SCAN_OPTION_ENUM(option), &evalue);
@@ -135,7 +135,7 @@
 	default_value = gsane_option_handler_get_enum(handler, desc, n, values, NULL);
 	self->priv->source_option = GNOME_SCAN_OPTION(gnome_scan_option_enum_new(desc->name, S_(desc->title), S_(desc->desc), GNOME_SCAN_OPTION_GROUP_SCANNER, SANE_GETTEXT_PACKAGE,
 										 default_value, values, GNOME_SCAN_OPTION_HINT_PRIMARY));
-	g_signal_connect_swapped(self->priv->source_option, "changed", G_CALLBACK(gsane_option_source_option_changed), self);
+	g_signal_connect_swapped(self->priv->source_option, "notify::value", G_CALLBACK(gsane_option_source_option_changed), self);
 	gnome_scan_node_install_option(GNOME_SCAN_NODE(handler->scanner), self->priv->source_option);
 }