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

[bersace svn gnome org]

Author: bersace
Date: Sat Dec 20 15:34:50 2008
New Revision: 715
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=715&view=rev

Log:
Fixes enum handling.

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

Modified: trunk/modules/gsane/gsane-option-handler.c
==============================================================================
--- trunk/modules/gsane/gsane-option-handler.c	(original)
+++ trunk/modules/gsane/gsane-option-handler.c	Sat Dec 20 15:34:50 2008
@@ -231,25 +231,32 @@
 		intval = gsane_option_handler_get_int(self, desc, index, error);
 		for (iter = values; iter; iter = iter->next) {
 			evalue = iter->data;
-			if (g_value_get_int(evalue->value) == intval)
+			if (g_value_get_int(&evalue->value) == intval)
 				return evalue;
 		}
+		/* default to first */
 		return values->data;
 		break;
 	case SANE_TYPE_FIXED:
 		doubleval = gsane_option_handler_get_double(self, desc, index, error);
 		for (iter = values; iter; iter = iter->next) {
 			evalue = iter->data;
-			if (g_value_get_double(evalue->value) == doubleval)
+			if (g_value_get_double(&evalue->value) == doubleval)
 				return evalue;
 		}
+		/* default to first */
+		return values->data;
+		break;
 	case SANE_TYPE_STRING:
 		strval = gsane_option_handler_get_string(self, desc, index, error);
 		for (iter = values; iter; iter = iter->next) {
 			evalue = iter->data;
-			if (g_str_equal(g_value_get_string(evalue->value), strval))
+			if (g_str_equal(g_value_get_string(&evalue->value), strval))
 				return evalue;
 		}
+		/* default to first */
+		return values->data;
+		break;
 	default:
 		break;
 	}
@@ -262,13 +269,13 @@
 {
 	switch(desc->type) {
 	case SANE_TYPE_INT:
-		return gsane_option_handler_set_int(self, desc, index, g_value_get_double(value->value), error);
+		return gsane_option_handler_set_int(self, desc, index, g_value_get_int(&value->value), error);
 		break;
 	case SANE_TYPE_FIXED:
-		return gsane_option_handler_set_double(self, desc, index, g_value_get_double(value->value), error);
+		return gsane_option_handler_set_double(self, desc, index, g_value_get_double(&value->value), error);
 		break;
 	case SANE_TYPE_STRING:
-		return gsane_option_handler_set_string(self, desc, index, g_value_dup_string(value->value), error);
+		return gsane_option_handler_set_string(self, desc, index, g_value_dup_string(&value->value), error);
 	default:
 		return FALSE;
 		break;