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

[bersace svn gnome org]

Author: bersace
Date: Mon Dec 22 23:55:47 2008
New Revision: 735
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=735&view=rev

Log:
Drop useless parameters to _enum_list_*.

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

Modified: trunk/modules/gsane/gsane-option-handler-generic.c
==============================================================================
--- trunk/modules/gsane/gsane-option-handler-generic.c	(original)
+++ trunk/modules/gsane/gsane-option-handler-generic.c	Mon Dec 22 23:55:47 2008
@@ -246,17 +246,17 @@
 		if (array_length > 1)
 			g_debug("Ignoring int enum array option %s", desc->name);
 		else
-			values = gsane_option_handler_enum_list_int_values(handler, desc, n, group);
+			values = gsane_option_handler_enum_list_int_values(handler, desc, n);
 		break;
 	case SANE_TYPE_FIXED:
 		array_length = desc->size/sizeof(SANE_Fixed);
 		if (array_length > 1)
 			g_debug("Ignoring double enum array option %s", desc->name);
 		else
-			values = gsane_option_handler_enum_list_double_values(handler, desc, n, group);
+			values = gsane_option_handler_enum_list_double_values(handler, desc, n);
 		break;
 	case SANE_TYPE_STRING:
-		values = gsane_option_handler_enum_list_string_values(handler, desc, n, group);
+		values = gsane_option_handler_enum_list_string_values(handler, desc, n);
 		break;
 	default:
 		g_debug("\toption %d : <unhandled> %s", n, desc->name);

Modified: trunk/modules/gsane/gsane-option-handler.c
==============================================================================
--- trunk/modules/gsane/gsane-option-handler.c	(original)
+++ trunk/modules/gsane/gsane-option-handler.c	Mon Dec 22 23:55:47 2008
@@ -107,7 +107,7 @@
 
 
 GSList*
-gsane_option_handler_enum_list_int_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n, const gchar* group)
+gsane_option_handler_enum_list_int_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n)
 {
 	GSList *list = NULL;
 	gint count = desc->constraint.word_list[0];
@@ -134,7 +134,7 @@
 }
 
 GSList*
-gsane_option_handler_enum_list_double_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n, const gchar* group)
+gsane_option_handler_enum_list_double_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n)
 {
 	GSList *list = NULL;
 	gint count = desc->constraint.word_list[0];
@@ -157,7 +157,7 @@
 }
 
 GSList*
-gsane_option_handler_enum_list_string_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n, const gchar* group)
+gsane_option_handler_enum_list_string_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n)
 {
 	GSList *list = NULL;
 	gint i;

Modified: trunk/modules/gsane/gsane-option-handler.h
==============================================================================
--- trunk/modules/gsane/gsane-option-handler.h	(original)
+++ trunk/modules/gsane/gsane-option-handler.h	Mon Dec 22 23:55:47 2008
@@ -97,9 +97,9 @@
 void gsane_option_handler_reload_options(GSaneOptionHandler *self);
 
 /* helper for option initialiazation. */
-GSList* gsane_option_handler_enum_list_int_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n, const gchar* group);
-GSList* gsane_option_handler_enum_list_double_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n, const gchar* group);
-GSList* gsane_option_handler_enum_list_string_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n, const gchar* group);
+GSList* gsane_option_handler_enum_list_int_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n);
+GSList* gsane_option_handler_enum_list_double_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n);
+GSList* gsane_option_handler_enum_list_string_values(GSaneOptionHandler *handler, const SANE_Option_Descriptor*desc, SANE_Int n);
 
 gboolean gsane_option_handler_get_bool(GSaneOptionHandler *self, const SANE_Option_Descriptor* desc, SANE_Int index, GError **error);
 gboolean gsane_option_handler_set_bool(GSaneOptionHandler *self, const SANE_Option_Descriptor* desc, SANE_Int index, gboolean value, GError **error);