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

[bersace svn gnome org]

Author: bersace
Date: Sun Dec 14 14:04:14 2008
New Revision: 676
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=676&view=rev

Log:
Translation option title and description.

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

Modified: trunk/modules/gsane/gsane-common.h
==============================================================================
--- trunk/modules/gsane/gsane-common.h	(original)
+++ trunk/modules/gsane/gsane-common.h	Sun Dec 14 14:04:14 2008
@@ -23,7 +23,12 @@
 #ifndef _GSANE_COMMON_H_
 #define _GSANE_COMMON_H_
 
+#if	HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
+#include <glib/gi18n-lib.h>
 #include <sane/sane.h>
 
 G_BEGIN_DECLS

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	Sun Dec 14 14:04:14 2008
@@ -61,7 +61,7 @@
 	switch(desc->type) {
 	case SANE_TYPE_BOOL:
 		boolval = gsane_option_handler_get_bool(GSANE_OPTION_HANDLER(self), desc, n, NULL);
-		self->priv->option = GNOME_SCAN_OPTION(gnome_scan_option_bool_new(desc->name, desc->title, desc->desc, group, SANE_GETTEXT_PACKAGE, boolval, hint));
+		self->priv->option = GNOME_SCAN_OPTION(gnome_scan_option_bool_new(desc->name, S_(desc->title), S_(desc->desc), group, SANE_GETTEXT_PACKAGE, boolval, hint));
 		g_signal_connect_swapped(self->priv->option, "notify::value", G_CALLBACK(gsane_option_handler_generic_bool_option_value_changed), self);
 		g_debug("\toption %d : boolean %s = %s", n, desc->name, GSANE_BOOLEAN_TO_STRING(boolval));
 		break;
@@ -119,7 +119,6 @@
 		.class_finalize	= NULL,
 		.class_data	= NULL,
 		.instance_size	= sizeof(GSaneOptionHandlerGeneric),
-		.n_preallocs	= 0,
 		.instance_init	= gsane_option_handler_generic_instance_init,
 		.value_table	= NULL,
 	};

Modified: trunk/modules/gsane/gsane-scanner.c
==============================================================================
--- trunk/modules/gsane/gsane-scanner.c	(original)
+++ trunk/modules/gsane/gsane-scanner.c	Sun Dec 14 14:04:14 2008
@@ -19,12 +19,7 @@
  *	Boston, MA 02110-1301, USA
  */
 
-#if	HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include <config.h>
-#include <glib/gi18n-lib.h>
 #include <gegl.h>
 #include <string.h>
 #include <gnome-scan-module.h>