gthumb r2535 - in trunk: . data

[mjc svn gnome org]

Author: mjc
Date: Tue Apr  7 17:03:13 2009
New Revision: 2535
URL: http://svn.gnome.org/viewvc/gthumb?rev=2535&view=rev

Log:
Merged 2532:2534 from gthumb-2-10.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/NEWS
   trunk/data/gthumb-import.desktop.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Apr  7 17:03:13 2009
@@ -1,5 +1,4 @@
 trunk, since last 2.10.x
-------------------------
 
 	UI Changes:
 
@@ -65,6 +64,17 @@
 	* libiptcdata is no longer used.
 	* libexif is no longer used.
 
+
+version 2.10.12
+---------------
+
+	Bugs fixed:
+
+	* Made the OK button the default widget in the rename dialog.
+	* The existing import scripts did not properly unmount gvfs-mounted
+        cameras. Gnome bug #560352, Ubuntu bug #351122.
+
+
 version 2.10.11
 ---------------
 

Modified: trunk/data/gthumb-import.desktop.in
==============================================================================
--- trunk/data/gthumb-import.desktop.in	(original)
+++ trunk/data/gthumb-import.desktop.in	Tue Apr  7 17:03:13 2009
@@ -3,7 +3,7 @@
 _GenericName=Photo Import Tool
 _Comment=Import the photos on your camera card
 Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;2DGraphics;Photography;
-Exec=sh -c 'gvfs-mount -u "%U"; exec gthumb --import-photos'
+Exec=sh -c 'gvfs-mount -u ~/.gvfs/gphoto2*; exec gthumb --import-photos'
 Icon=gthumb
 MimeType=x-content/image-dcf;x-content/image-picturecd;
 NoDisplay=true