gnome-scan r603 - in trunk: . lib

[bersace svn gnome org]

Author: bersace
Date: Thu May  8 13:08:53 2008
New Revision: 603
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=603&view=rev

Log:
Remove gnome-scan-types.[hc] generated source using glib-mkenums. We
now uses Vala and gnome-scan-common.[hc].


Removed:
   trunk/lib/gnome-scan-types.c
   trunk/lib/gnome-scan-types.c.tpl
   trunk/lib/gnome-scan-types.h
   trunk/lib/gnome-scan-types.h.tpl
Modified:
   trunk/ChangeLog
   trunk/lib/Makefile.am
   trunk/lib/gnome-scan-scanner.c
   trunk/lib/gnome-scan-utils.c

Modified: trunk/lib/Makefile.am
==============================================================================
--- trunk/lib/Makefile.am	(original)
+++ trunk/lib/Makefile.am	Thu May  8 13:08:53 2008
@@ -6,20 +6,8 @@
 AM_CFLAGS = \
 	-Wall -g
 
-BUILT_HEADER = \
-	$(srcdir)/gnome-scan-types.h
-
-BUILT_SOURCE = \
-	$(srcdir)/gnome-scan-types.c
-
 BUILT_SOURCES = \
-	gnome-scan.vala.stamp \
-	$(BUILT_SOURCE)
-
-types_deps = \
-	gnome-scan-param-specs.h \
-	gnome-scan-utils.h \
-	$(NULL)
+	gnome-scan.vala.stamp
 
 lib_LTLIBRARIES = \
 	lib SONAME@.la 
@@ -126,18 +114,11 @@
 	gnome-scan-param-specs.h        \
 	gnome-scan-init.h 
 
-
-gnome-scan-types.%: $(types_deps) Makefile gnome-scan-types.%.tpl
-	test ! -e $@ && touch $@; exit 0;
-	test -w $@ && glib-mkenums --template $(srcdir)/$  tpl $(types_deps) > $@; exit 0
-
 gnome-scan.vala.stamp: $(lib SONAME@_la_VALASOURCES)
 	$(VALAC) -C $(lib SONAME@_la_VALAPKGADD) $^
 	touch $@
 
 EXTRA_DIST = \
-	gnome-scan-types.h.tpl	\
-	gnome-scan-types.c.tpl	\
 	gnome-scan.vala.stamp	\
 	$(lib SONAME@_la_VALASOURCES)	\
 	$(NULL)

Modified: trunk/lib/gnome-scan-scanner.c
==============================================================================
--- trunk/lib/gnome-scan-scanner.c	(original)
+++ trunk/lib/gnome-scan-scanner.c	Thu May  8 13:08:53 2008
@@ -36,7 +36,7 @@
 #include <glib/gi18n.h>
 #include "gnome-scan-private.h"
 #include "gnome-scan-scanner.h"
-#include "gnome-scan-types.h"
+
 #define	GET_PRIVATE(o)	(G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_SCANNER, GnomeScanScannerPrivate))
 
 typedef struct _GnomeScanScannerPrivate GnomeScanScannerPrivate;
@@ -124,7 +124,7 @@
 gnome_scanner_class_init (GnomeScanScannerClass *klass)
 {
   GObjectClass* object_class = G_OBJECT_CLASS (klass);
-  parent_class = GNOME_SCAN_SCAN_PLUGIN_CLASS (g_type_class_peek_parent (klass));
+  parent_class = GNOME_SCAN_PLUGIN_CLASS (g_type_class_peek_parent (klass));
 
   g_type_class_add_private (klass, sizeof (GnomeScanScannerPrivate));
   object_class->finalize = gnome_scanner_finalize;

Modified: trunk/lib/gnome-scan-utils.c
==============================================================================
--- trunk/lib/gnome-scan-utils.c	(original)
+++ trunk/lib/gnome-scan-utils.c	Thu May  8 13:08:53 2008
@@ -26,7 +26,6 @@
  * 
  **/
 #include "gnome-scan-utils.h"
-#include "gnome-scan-types.h"
 
 const gchar*
 gnome_scan_enum_get_nick_from_value (GType type, guint value)