--- ../cvs/configure	2006-09-23 15:20:57.000000000 +1000
+++ ./configure	2006-09-24 15:53:44.000000000 +1000
@@ -22327,7 +22327,7 @@ expanded_libdir=`( case $prefix in NONE)
 GNOME_ICON_THEME_PREFIX=`$PKG_CONFIG --variable=prefix gnome-icon-theme`
 
 
-                                                                                                                                                                                              ac_config_files="$ac_config_files Makefile FlickrNet/Makefile google-sharp/Makefile gnome-keyring-sharp/Makefile icons/Makefile libeog/Makefile libeog/cursors/Makefile libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile semweb/Makefile tools/Makefile po/Makefile.in src/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Makefile f-spot.spec f-spot.desktop.in"
+                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile FlickrNet/Makefile google-sharp/Makefile gnome-keyring-sharp/Makefile icons/Makefile libeog/Makefile libeog/cursors/Makefile libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile semweb/Makefile tools/Makefile po/Makefile.in src/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Makefile f-spot.spec f-spot.desktop.in f-spot-view.desktop.in"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -22893,6 +22893,7 @@ do
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   "f-spot.spec" ) CONFIG_FILES="$CONFIG_FILES f-spot.spec" ;;
   "f-spot.desktop.in" ) CONFIG_FILES="$CONFIG_FILES f-spot.desktop.in" ;;
+  "f-spot-view.desktop.in" ) CONFIG_FILES="$CONFIG_FILES f-spot-view.desktop.in" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
   "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
--- ../cvs/configure.in	2006-09-20 06:51:48.000000000 +1000
+++ ./configure.in	2006-09-24 15:51:17.000000000 +1000
@@ -194,4 +194,5 @@ src/f-spot.exe.config
 src/Makefile
 f-spot.spec
 f-spot.desktop.in
+f-spot-view.desktop.in
 ])
--- ../cvs/Makefile.in	2006-09-23 15:20:55.000000000 +1000
+++ ./Makefile.in	2006-09-24 15:53:42.000000000 +1000
@@ -181,13 +181,15 @@ DISTCLEANFILES =          intltool-extra
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  f-spot.spec f-spot.desktop.in
+CONFIG_CLEAN_FILES =  f-spot.spec f-spot.desktop.in \
+f-spot-view.desktop.in
 DATA =  $(Applications_DATA)
 
 DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
 Makefile.am Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess \
-config.h.in config.sub configure configure.in f-spot.desktop.in.in \
-f-spot.spec.in install-sh ltmain.sh missing mkinstalldirs
+config.h.in config.sub configure configure.in f-spot-view.desktop.in.in \
+f-spot.desktop.in.in f-spot.spec.in install-sh ltmain.sh missing \
+mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -242,6 +244,8 @@ f-spot.spec: $(top_builddir)/config.stat
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 f-spot.desktop.in: $(top_builddir)/config.status f-spot.desktop.in.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+f-spot-view.desktop.in: $(top_builddir)/config.status f-spot-view.desktop.in.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 install-ApplicationsDATA: $(Applications_DATA)
 	@$(NORMAL_INSTALL)
--- /dev/null	2006-05-23 00:25:23.000000000 +1000
+++ ./f-spot-view.desktop.in.in	2006-09-24 15:35:59.000000000 +1000
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+_Name=F-Spot Photo Viewer
+_GenericName=Photo Viewer
+TryExec=f-spot
+Exec=f-spot --view %u
+NoDisplay=true
+Icon=f-spot-logo
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Application;Graphics;Viewer;GNOME;GTK
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=f-spot
+X-GNOME-Bugzilla-Component=General
+X-GNOME-Bugzilla-Version=@VERSION@
+X-SuSE-translate=true
+MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/x-dcraw;image/x-ciff;image/x-mrw;image/x-x3f;image/x-orf;image/x-nef;image/x-cr2;image/x-raf;
--- ../cvs/ChangeLog	2006-09-23 07:17:36.000000000 +1000
+++ ./ChangeLog	2006-09-24 16:02:03.000000000 +1000
@@ -1,3 +1,11 @@
+2006-09-24  Bengt Thuree  <bengt@thuree.com>
+
+	* configure.in:
+	* configure:
+	* Makefile.in: Added handling of f-spot-view.desktop.in.in
+	* f-spot-view.desktop.in.in: New file, with @VERSION@ - Closes #352844
+
+
 2006-09-21  Stephane Delcroix  <stephane@delcroix.org>
  
  	* gnome-keyring-sharp/AssemblyInfo.cs:
