f-spot r3842 - trunk

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Thu Apr 24 15:32:56 2008
New Revision: 3842
URL: http://svn.gnome.org/viewvc/f-spot?rev=3842&view=rev

Log:
2008-04-24  Stephane Delcroix  <sdelcroix novell com>

	* autogen.sh: Expliciting an error message

	* f-spot-import.desktop.in.in:
	* configure.in:
	* Makefile.am: x-ocntent/* support, integrates just fine with newest
	nautilus. Fixes bgo #510325.


Added:
   trunk/f-spot-import.desktop.in.in
Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/autogen.sh
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Apr 24 15:32:56 2008
@@ -38,7 +38,8 @@
 
 desktop_in_files=	\
 	f-spot.desktop.in	\
-	f-spot-view.desktop.in
+	f-spot-view.desktop.in	\
+	f-spot-import.desktop.in
 
 desktop_files=$(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Thu Apr 24 15:32:56 2008
@@ -50,7 +50,7 @@
   grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
   (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "**Error**: You must have \`glib' installed to compile $PROJECT."
+    echo "**Error**: You must have \`glib-devel' (or glib2-devel) installed to compile $PROJECT."
     DIE=1
   }
 }

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Apr 24 15:32:56 2008
@@ -324,4 +324,5 @@
 f-spot.spec
 f-spot.desktop.in
 f-spot-view.desktop.in
+f-spot-import.desktop.in
 ])

Added: trunk/f-spot-import.desktop.in.in
==============================================================================
--- (empty file)
+++ trunk/f-spot-import.desktop.in.in	Thu Apr 24 15:32:56 2008
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+_Name=F-Spot Photo Manager
+_GenericName=Photo Manager
+_Comment=Import into F-Spot
+NoDisplay=true
+Exec=f-spot-import %u
+Icon=f-spot
+MimeType=x-content/image-dcf;x-content/image-picturecd
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Graphics;Photography;GNOME;GTK;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=f-spot
+X-GNOME-Bugzilla-Component=General
+X-GNOME-Bugzilla-Version= VERSION@
+X-GNOME-DocPath=f-spot/f-spot.xml
+X-SuSE-translate=true