gnome-scan r608 - in trunk: lib modules

[bersace svn gnome org]

Author: bersace
Date: Fri May 23 22:04:47 2008
New Revision: 608
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=608&view=rev

Log:
Fixed migration of naming.


Modified:
   trunk/lib/Makefile.am
   trunk/lib/gnome-scan-job.c
   trunk/lib/gnome-scan-option.vala
   trunk/lib/gnome-scan-param-specs.h
   trunk/lib/gnome-scan-preview-area.h
   trunk/lib/gnome-scan-preview-plugin.c
   trunk/lib/gnome-scan-processor-common.c
   trunk/modules/gsane-meta-param.c

Modified: trunk/lib/Makefile.am
==============================================================================
--- trunk/lib/Makefile.am	(original)
+++ trunk/lib/Makefile.am	Fri May 23 22:04:47 2008
@@ -13,8 +13,9 @@
 	lib SONAME@.la 
 
 libgnomescan_la_VALASOURCES = \
-	gnome-scan-option.vala	\
 	gnome-scan-common.vala	\
+	gnome-scan-option.vala	\
+	gnome-scan-option-widget.vala \
 	$(NULL)
 
 lib SONAME@_la_VALAPKGADD = \
@@ -22,6 +23,7 @@
 	--pkg=gtk+-2.0	\
 	--pkg=gconf-2.0 \
 	--vapidir=$(top_srcdir) --pkg=config \
+	--vapidir=$(top_srcdir)/bindings/vapi --pkg=gnome-scan \
 	$(NULL)
 
 lib SONAME@_la_SOURCES = \

Modified: trunk/lib/gnome-scan-job.c
==============================================================================
--- trunk/lib/gnome-scan-job.c	(original)
+++ trunk/lib/gnome-scan-job.c	Fri May 23 22:04:47 2008
@@ -50,7 +50,7 @@
 {
 	gboolean			disposed;
 	GnomeScanSettings	*settings;
-	GnomeScanScanner		*scanner;
+	GnomeScanScanner	*scanner;
 	GSList				*processors;
 	GnomeScanSink		*sink;
 	
@@ -112,7 +112,7 @@
 			break;
 		case PROP_SCANNER:
 			gnome_scan_job_set_scanner (GNOME_SCAN_JOB (object),
-										GNOME_SCANNER (g_value_get_object (value)));
+										GNOME_SCAN_SCANNER (g_value_get_object (value)));
 			break;
 		case PROP_SINK:
 			gnome_scan_job_set_sink (GNOME_SCAN_JOB (object),

Modified: trunk/lib/gnome-scan-option.vala
==============================================================================
--- trunk/lib/gnome-scan-option.vala	(original)
+++ trunk/lib/gnome-scan-option.vala	Fri May 23 22:04:47 2008
@@ -8,10 +8,11 @@
 		public const Quark GROUP_HIDDEN			= Quark.from_string("$$HIDDEN$$");
 		public const Quark GROUP_PREVIEW		= Quark.from_string("$$PREVIEW");
 
+		[Flags]
 		public enum OptionFlags {
 			ACTIVE	= 1 << 0,
-			RANGE,
-			ENUM
+			RANGE	= 1 << 1,
+			ENUM	= 1 << 2
 		}
 	}
 }

Modified: trunk/lib/gnome-scan-param-specs.h
==============================================================================
--- trunk/lib/gnome-scan-param-specs.h	(original)
+++ trunk/lib/gnome-scan-param-specs.h	Fri May 23 22:04:47 2008
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include <gegl.h>
-#include "gnome-scan-utils.h"
+#include "gnome-scan-common.h"
 
 G_BEGIN_DECLS
 

Modified: trunk/lib/gnome-scan-preview-area.h
==============================================================================
--- trunk/lib/gnome-scan-preview-area.h	(original)
+++ trunk/lib/gnome-scan-preview-area.h	Fri May 23 22:04:47 2008
@@ -25,7 +25,7 @@
 
 #include <gtk/gtk.h>
 #include <cairo.h>
-#include "gnome-scan-utils.h"
+#include "gnome-scan-common.h"
 #include "gnome-scan-preview-plugin.h"
 
 G_BEGIN_DECLS

Modified: trunk/lib/gnome-scan-preview-plugin.c
==============================================================================
--- trunk/lib/gnome-scan-preview-plugin.c	(original)
+++ trunk/lib/gnome-scan-preview-plugin.c	Fri May 23 22:04:47 2008
@@ -37,7 +37,7 @@
 #include "gnome-scan-param-specs.h"
 #include "gnome-scan-preview-plugin.h"
 #include "gnome-scan-preview-area.h"
-#include "gnome-scan-utils.h"
+#include "gnome-scan-common.h"
 
 static void	gnome_scan_preview_plugin_class_init	(GnomeScanPreviewPluginClass *klass);
 static void	gnome_scan_preview_plugin_init			(GnomeScanPreviewPlugin *plugin);

Modified: trunk/lib/gnome-scan-processor-common.c
==============================================================================
--- trunk/lib/gnome-scan-processor-common.c	(original)
+++ trunk/lib/gnome-scan-processor-common.c	Fri May 23 22:04:47 2008
@@ -26,7 +26,7 @@
 
 #include <glib/gi18n.h>
 #include "gnome-scan-param-specs.h"
-#include "gnome-scan-utils.h"
+#include "gnome-scan-common.h"
 #include "gnome-scan-processor-common.h"
 #include "gnome-scan-preview-plugin-rotation.h"
 

Modified: trunk/modules/gsane-meta-param.c
==============================================================================
--- trunk/modules/gsane-meta-param.c	(original)
+++ trunk/modules/gsane-meta-param.c	Fri May 23 22:04:47 2008
@@ -24,7 +24,7 @@
 #include <gtk/gtk.h>
 #include <gnome-scan-plugin.h>
 #include <gnome-scan-preview-plugin-area.h>
-#include <gnome-scan-utils.h>
+#include <gnome-scan-common.h>
 #include "gsane-meta-param.h"
 
 /**