f-spot r4433 - in trunk: . tools

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon Sep 22 20:19:46 2008
New Revision: 4433
URL: http://svn.gnome.org/viewvc/f-spot?rev=4433&view=rev

Log:
Merge commit 'f04c95'

Modified:
   trunk/f-spot-import.desktop.in.in
   trunk/f-spot.desktop.in.in
   trunk/tools/f-spot-screensaver.desktop.in

Modified: trunk/f-spot-import.desktop.in.in
==============================================================================
--- trunk/f-spot-import.desktop.in.in	(original)
+++ trunk/f-spot-import.desktop.in.in	Mon Sep 22 20:19:46 2008
@@ -6,7 +6,7 @@
 NoDisplay=true
 Exec=f-spot-import %u
 Icon=f-spot
-MimeType=x-content/image-dcf;x-content/image-picturecd
+MimeType=x-content/image-dcf;x-content/image-picturecd;
 StartupNotify=true
 Terminal=false
 Type=Application

Modified: trunk/f-spot.desktop.in.in
==============================================================================
--- trunk/f-spot.desktop.in.in	(original)
+++ trunk/f-spot.desktop.in.in	Mon Sep 22 20:19:46 2008
@@ -14,4 +14,3 @@
 X-GNOME-Bugzilla-Component=General
 X-GNOME-Bugzilla-Version= VERSION@
 X-GNOME-DocPath=f-spot/f-spot.xml
-X-SuSE-translate=true

Modified: trunk/tools/f-spot-screensaver.desktop.in
==============================================================================
--- trunk/tools/f-spot-screensaver.desktop.in	(original)
+++ trunk/tools/f-spot-screensaver.desktop.in	Mon Sep 22 20:19:46 2008
@@ -7,3 +7,4 @@
 Terminal=false
 Type=Application
 Categories=GNOME;Screensaver;
+OnlyShowIn=GNOME;