gnome-scan r624 - in trunk: lib po

[bersace svn gnome org]

Author: bersace
Date: Tue Oct 21 19:17:20 2008
New Revision: 624
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=624&view=rev

Log:
Fix building with vala 0.4


Modified:
   trunk/lib/gnome-scan-common.vala
   trunk/lib/gnome-scan-option.vala
   trunk/po/Makefile.in.in

Modified: trunk/lib/gnome-scan-common.vala
==============================================================================
--- trunk/lib/gnome-scan-common.vala	(original)
+++ trunk/lib/gnome-scan-common.vala	Tue Oct 21 19:17:20 2008
@@ -26,11 +26,13 @@
 		}
 
 		public struct Format {
-			string		name;
-			string		description;
-			string		domain;
-			string[]	mime_types;
-			string[]	extensions;
+			public string		name;
+			public string		description;
+			public string		domain;
+			[NoArrayLength]
+			public string[]	mime_types;
+			[NoArrayLength]
+			public string[]	extensions;
 		}
 
 		private const double MM_PER_INCH	= 25.4;
@@ -108,7 +110,7 @@
 			case Unit.PIXEL:
 				return val * (MM_PER_INCH / res);
 			}
-			return 0.;
+			return 0;
 		}
 
 		public double convert_to_mm(double val,
@@ -128,7 +130,7 @@
 			case Unit.PIXEL:
 				return val / (MM_PER_INCH / res);
 			}
-			return 0.;
+			return 0;
 		}
 
 		public struct Rectangle {

Modified: trunk/lib/gnome-scan-option.vala
==============================================================================
--- trunk/lib/gnome-scan-option.vala	(original)
+++ trunk/lib/gnome-scan-option.vala	Tue Oct 21 19:17:20 2008
@@ -35,10 +35,6 @@
 	[Notify]
 		public OptionFlags	flags	{get; set construct;}
 	public int	index	{get; set construct; default = 0;}
-
-	public Value init_value();
-	public Value from_gconf_value(GConf.Value value);
-	public GConf.Value to_gconf_value(Value value);
 }
 
 public class Gnome.Scan.OptionInt : Gnome.Scan.Option {
@@ -84,7 +80,7 @@
 }
 
 public class Gnome.Scan.OptionDouble : Gnome.Scan.Option {
-	public double default_value {get; set construct; default = 0.;}
+	public double default_value {get; set construct; default = 0;}
 	public double	min;
 	public double	max;
 	public double	step;

Modified: trunk/po/Makefile.in.in
==============================================================================
--- trunk/po/Makefile.in.in	(original)
+++ trunk/po/Makefile.in.in	Tue Oct 21 19:17:20 2008
@@ -54,16 +54,16 @@
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
 
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
-POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
 # This comment gets stripped out
@@ -101,7 +101,6 @@
 install-data: install-data- USE_NLS@
 install-data-no: all
 install-data-yes: all
-	$(mkdir_p) $(DESTDIR)$(itlocaledir)
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
 	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \