gnome-scan r555 - in trunk: . modules

[bersace svn gnome org]

Author: bersace
Date: Thu Feb 28 22:26:44 2008
New Revision: 555
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=555&view=rev

Log:
Workaround buggy SANE epson backend.

Modified:
   trunk/ChangeLog
   trunk/modules/gsane-scanner.c

Modified: trunk/modules/gsane-scanner.c
==============================================================================
--- trunk/modules/gsane-scanner.c	(original)
+++ trunk/modules/gsane-scanner.c	Thu Feb 28 22:26:44 2008
@@ -694,7 +694,6 @@
 	
 	spec = gss_option_get_param_spec (gss, 0);
 	value = gsane_scanner_option_get_value(gss, spec);
-	n = g_value_get_int (value);
 	
 	gs_debug(" === Device %s (%d options) ===",
 		 gnome_scan_plugin_get_name(GNOME_SCAN_PLUGIN(gss)), n);
@@ -837,6 +836,10 @@
 		break;
 	}
 	
+	/* workaround buggy epson driver */
+	if (n == 0)
+		type = G_TYPE_INT;
+	
 	name = g_utf8_strlen(desc->name, 32) < 1 ?
 		g_strdup_printf("option-%i", unnamed++)
 		: g_strdup (desc->name);