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

[bersace svn gnome org]

Author: bersace
Date: Sun Dec 21 18:13:30 2008
New Revision: 730
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=730&view=rev

Log:
Fix registration of rules by name.

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

Modified: trunk/modules/gsane/gsane-option-manager.c
==============================================================================
--- trunk/modules/gsane/gsane-option-manager.c	(original)
+++ trunk/modules/gsane/gsane-option-manager.c	Sun Dec 21 18:13:30 2008
@@ -51,7 +51,18 @@
 void
 gsane_option_manager_add_rule_by_name(GSaneOptionManager* self, const gchar* name, GType handler_type)
 {
-	g_hash_table_insert(self->priv->type_rules, g_strdup(name), (gpointer)handler_type);
+	g_hash_table_insert(self->priv->name_rules, g_strdup(name), (gpointer)handler_type);
+}
+
+void
+gsane_option_manager_add_rules_by_name(GSaneOptionManager* self, GType handler_type, ...)
+{
+	va_list names;
+	gchar* name;
+	va_start(names, handler_type);
+	while ((name = (gchar*) va_arg(names, gchar*)) != NULL)
+		gsane_option_manager_add_rule_by_name(self, name, handler_type);
+	va_end(names);
 }
 
 void

Modified: trunk/modules/gsane/gsane-option-manager.h
==============================================================================
--- trunk/modules/gsane/gsane-option-manager.h	(original)
+++ trunk/modules/gsane/gsane-option-manager.h	Sun Dec 21 18:13:30 2008
@@ -50,6 +50,7 @@
 void gsane_option_manager_destroy(GSaneOptionManager *self);
 void gsane_option_manager_add_rule_by_type(GSaneOptionManager* self, SANE_Value_Type value_type, GType handler_type);
 void gsane_option_manager_add_rule_by_name(GSaneOptionManager* self, const gchar* name, GType handler_type);
+void gsane_option_manager_add_rules_by_name(GSaneOptionManager* self, GType handler_type, ...);
 GType gsane_option_manager_get_handler_type(GSaneOptionManager* self, const SANE_Option_Descriptor* desc);
 GType gsane_option_manager_get_type(void) G_GNUC_CONST;