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

[bersace svn gnome org]

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

Log:
Add option named as implicit match.

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 13:39:17 2008
@@ -78,12 +78,16 @@
 	gchar** name##_names;
 
 /* Install a named SANE option handler in the class. Requires
-   gsane_option_handler_handler_<oname> to be declared. See
-   GSANE_OPTION_HANDLER_DEFINE_OPTION and
-   GSANE_OPTION_HANDLER_CLASS_DEFINE_HANDLER. */
+ * gsane_option_handler_handler_<oname> to be declared. See
+ * GSANE_OPTION_HANDLER_DEFINE_OPTION and
+ * GSANE_OPTION_HANDLER_CLASS_DEFINE_HANDLER.
+ *
+ * oname is a string containing all other SANE option name that should
+ * be matched as oname.
+ */
 #define GSANE_OPTION_HANDLER_CLASS_INSTALL_OPTION(klass, oname, onames)		\
 	klass->handle_##oname = gsane_option_handler_handle_##oname;	\
-	klass->oname##_names = g_strsplit(onames, ",", 8);
+	klass->oname##_names = g_strsplit(#oname "," onames, ",", 8);
 
 /* If SANE option desc match oname, desc and n are saved in self->priv
    and named option handler is called. */

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 13:39:17 2008
@@ -157,7 +157,7 @@
 
 	oh_class->unique = TRUE;
 	oh_class->handle_option = gsane_option_source_handle_option;
-	GSANE_OPTION_HANDLER_CLASS_INSTALL_OPTION(klass, source, "source,doc-source");
+	GSANE_OPTION_HANDLER_CLASS_INSTALL_OPTION(klass, source, "doc-source");
 }
 
 void