gnome-scan r789 - in trunk: . src

[bersace svn gnome org]

Author: bersace
Date: Thu Jan 15 18:46:38 2009
New Revision: 789
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=789&view=rev

Log:
Drop strlen() on NULL string.

Modified:
   trunk/ChangeLog
   trunk/src/flegita-options.vala

Modified: trunk/src/flegita-options.vala
==============================================================================
--- trunk/src/flegita-options.vala	(original)
+++ trunk/src/flegita-options.vala	Thu Jan 15 18:46:38 2009
@@ -29,7 +29,7 @@
 		private string filename;
 		private Gnome.Scan.Format? format = null;
 
-		private SList<Gnome.Scan.Format> formats;
+		private SList<weak Gnome.Scan.Format> formats;
 
 		public OptionOutputFilename(string name, string title, string desc, string domain, string group, OptionHint hint)
 		{
@@ -57,7 +57,7 @@
 
 		private void update_value()
 		{
-			if (this.directory.len() > 2 && this.filename.len() > 2 && this.format != null) 
+			if (this.directory != null && this.filename != null	&& this.format != null)
 				this.value = this.directory.concat(GLib.Path.DIR_SEPARATOR_S, this.filename, ".", this.format.suffixes[0]);
 			else
 				this.value = null;