gthumb r2443 - in branches/gthumb-2-10: . data

[mjc svn gnome org]

Author: mjc
Date: Wed Nov 12 16:30:59 2008
New Revision: 2443
URL: http://svn.gnome.org/viewvc/gthumb?rev=2443&view=rev

Log:
2008-11-12  Michael J. Chudobiak  <mjc svn gnome org>

        * NEWS:
        * data/Makefile.am:
        * data/gthumb-import.desktop.in:
        * data/gthumb.desktop.in:
        Added a new gthumb-import.desktop.in file to handle gvfs-mounted
        cameras more elegantly. The camera is first unmounted, and the
        libgphoto import routines are then run. Merged from Ubuntu.
        Bug #560352. Patch by Martin Pitt <martin pitt canonical com>.



Added:
   branches/gthumb-2-10/data/gthumb-import.desktop.in
Modified:
   branches/gthumb-2-10/ChangeLog
   branches/gthumb-2-10/NEWS
   branches/gthumb-2-10/data/Makefile.am
   branches/gthumb-2-10/data/gthumb.desktop.in

Modified: branches/gthumb-2-10/NEWS
==============================================================================
--- branches/gthumb-2-10/NEWS	(original)
+++ branches/gthumb-2-10/NEWS	Wed Nov 12 16:30:59 2008
@@ -3,6 +3,9 @@
 
 	* The "g" key now launches the "gimp" command, instead of the
 	  deprecated "gimp-remote" command.
+	* Added a new gthumb-import.desktop.in file to handle gvfs-mounted
+          cameras more elegantly. The camera is first unmounted, and the
+          libgphoto import routines are then run. Bug #560352.
 
 version 2.10.10
 ---------------

Modified: branches/gthumb-2-10/data/Makefile.am
==============================================================================
--- branches/gthumb-2-10/data/Makefile.am	(original)
+++ branches/gthumb-2-10/data/Makefile.am	Wed Nov 12 16:30:59 2008
@@ -3,7 +3,7 @@
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
-desktop_in_files=gthumb.desktop.in
+desktop_in_files=gthumb.desktop.in gthumb-import.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) 
 
 icondir = $(datadir)/icons/hicolor/48x48/apps

Added: branches/gthumb-2-10/data/gthumb-import.desktop.in
==============================================================================
--- (empty file)
+++ branches/gthumb-2-10/data/gthumb-import.desktop.in	Wed Nov 12 16:30:59 2008
@@ -0,0 +1,16 @@
+[Desktop Entry]
+_Name=gThumb Image Viewer
+_GenericName=Image Viewer
+_Comment=View and organize your images
+Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;2DGraphics;Photography;
+Exec=sh -c 'gvfs-mount -u "%U"; exec gthumb --import-photos'
+Icon=gthumb
+MimeType=x-content/image-dcf;x-content/image-picturecd;
+NoDisplay=true
+StartupNotify=true
+Terminal=false
+Type=Application
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gthumb
+X-GNOME-Bugzilla-Component=general
+X-GNOME-DocPath=gthumb/gthumb.xml

Modified: branches/gthumb-2-10/data/gthumb.desktop.in
==============================================================================
--- branches/gthumb-2-10/data/gthumb.desktop.in	(original)
+++ branches/gthumb-2-10/data/gthumb.desktop.in	Wed Nov 12 16:30:59 2008
@@ -5,7 +5,7 @@
 Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;2DGraphics;Photography;
 Exec=gthumb %U
 Icon=gthumb
-MimeType=image/bmp;image/jpeg;image/gif;image/png;image/tiff;image/x-bmp;image/x-ico;image/x-png;image/x-pcx;image/x-tga;image/xpm;image/svg+xml;x-content/image-dcf;x-content/image-picturecd;
+MimeType=image/bmp;image/jpeg;image/gif;image/png;image/tiff;image/x-bmp;image/x-ico;image/x-png;image/x-pcx;image/x-tga;image/xpm;image/svg+xml;
 StartupNotify=true
 Terminal=false
 Type=Application