[f-spot] Fix spaces between arguments in launcher.

[Ruben Vermeersch <rubenv src gnome org>]

commit 9985b78ade358c6c622ed31f499c798ebd695823
Author: Ruben Vermeersch <ruben savanne be>
Date:   Tue Jun 8 19:07:15 2010 +0200

    Fix spaces between arguments in launcher.

 src/f-spot.in |    6 +++++-
 src/main.cs   |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/f-spot.in b/src/f-spot.in
index f9df57e..3b8227b 100644
--- a/src/f-spot.in
+++ b/src/f-spot.in
@@ -42,7 +42,11 @@ for arg in "$@";do
         *) args+=("$arg");;
     esac;
 done;
-set -- ${args[ ]}
+args=${args[ ]}
+args=${args/photodir /photodir=}
+args=${args/basedir /basedir=}
+args=${args/import /import=}
+set -- $args
 
 for arg in "$@"; do
     case "x$arg" in
diff --git a/src/main.cs b/src/main.cs
index f06aae5..246c881 100644
--- a/src/main.cs
+++ b/src/main.cs
@@ -56,8 +56,8 @@ namespace FSpot
 					new LayoutOption ("versions", "Show detailed version information")),
 				new LayoutGroup ("options", "General options",
 					new LayoutOption ("basedir=DIR", "Path to the photo database folder"),
-					new LayoutOption ("import=FILE", "Path to the photo database folder"),
-					new LayoutOption ("photodir=DIR", "Path to the photo database folder"),
+					new LayoutOption ("import=URI", "Import from the given uri"),
+					new LayoutOption ("photodir=DIR", "Default import folder"),
 					new LayoutOption ("view ITEM", "View file(s) or directories"),
 					new LayoutOption ("shutdown", "Shut down a running instance of F-Spot"),
 					new LayoutOption ("slideshow", "Display a slideshow"),