gnome-scan r748 - in trunk: . modules/gsane

[bersace svn gnome org]

Author: bersace
Date: Thu Dec 25 18:22:31 2008
New Revision: 748
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=748&view=rev

Log:
Manually define option field.

Modified:
   trunk/ChangeLog
   trunk/modules/gsane/gsane-option-handler.h
   trunk/modules/gsane/gsane-option-source.c

Modified: trunk/modules/gsane/gsane-option-handler.h
==============================================================================
--- trunk/modules/gsane/gsane-option-handler.h	(original)
+++ trunk/modules/gsane/gsane-option-handler.h	Thu Dec 25 18:22:31 2008
@@ -69,8 +69,7 @@
 /* Define private structs fields to handle a named SANE option  */
 #define GSANE_OPTION_HANDLER_DEFINE_OPTION(name)			\
 	const SANE_Option_Descriptor* name##_desc;			\
-	SANE_Int name##_index;						\
-	GnomeScanOption* name##_option;
+	SANE_Int name##_index;
 
 /* Define class struct field to handle a named SANE option. */
 #define	GSANE_OPTION_HANDLER_CLASS_DEFINE_HANDLER(name)			\

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 18:22:31 2008
@@ -29,6 +29,7 @@
 
 struct _GSaneOptionSourcePrivate {
 	GSANE_OPTION_HANDLER_DEFINE_OPTION(source);
+	GnomeScanOption *option;
 };
 
 G_DEFINE_TYPE(GSaneOptionSource, gsane_option_source, GSANE_TYPE_OPTION_HANDLER);
@@ -133,10 +134,10 @@
 	}
 
 	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, "notify::value", G_CALLBACK(gsane_option_source_option_changed), self);
-	gnome_scan_node_install_option(GNOME_SCAN_NODE(handler->scanner), self->priv->source_option);
+	self->priv->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->option, "notify::value", G_CALLBACK(gsane_option_source_option_changed), self);
+	gnome_scan_node_install_option(GNOME_SCAN_NODE(handler->scanner), self->priv->option);
 }
 
 void