gthumb r2424 - in trunk: . doc/C src

[mjc svn gnome org]

Author: mjc
Date: Wed Oct  8 19:09:55 2008
New Revision: 2424
URL: http://svn.gnome.org/viewvc/gthumb?rev=2424&view=rev

Log:
Merged 2420:2421 from gthumb-2-10.


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/doc/C/gthumb.xml
   trunk/src/dlg-scripts.c
   trunk/src/gth-browser.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Oct  8 19:09:55 2008
@@ -65,6 +65,12 @@
 	* libiptcdata is no longer used.
 	* libexif is no longer used.
 
+version 2.10.11
+---------------
+
+	* The "g" key now launches the "gimp" command, instead of the
+	  deprecated "gimp-remote" command.
+
 version 2.10.10
 ---------------
 

Modified: trunk/doc/C/gthumb.xml
==============================================================================
--- trunk/doc/C/gthumb.xml	(original)
+++ trunk/doc/C/gthumb.xml	Wed Oct  8 19:09:55 2008
@@ -3229,12 +3229,12 @@
       <itemizedlist>
 	  <listitem>
 	    <para>
-		<command>gimp-remote %F</command>
+		<command>gimp %F</command>
             </para>
 	    <para>
 		This script tells the GNU Image Manipulation Program (gimp) to open
 	        all of the select files. This is most efficient if we include all of
-	 	the filenames on one line, rather than calling <command>gimp-remote</command>
+	 	the filenames on one line, rather than calling <command>gimp</command>
 		once for each file, so we have used the %F code.
 	    </para>
           </listitem>

Modified: trunk/src/dlg-scripts.c
==============================================================================
--- trunk/src/dlg-scripts.c	(original)
+++ trunk/src/dlg-scripts.c	Wed Oct  8 19:09:55 2008
@@ -87,7 +87,7 @@
 
 
 static ScriptCommand script_commands[] = { 
-	{N_("Edit with GIMP"), "gimp-remote %F"},
+	{N_("Edit with GIMP"), "gimp %F"},
 	{N_("Add copyright"), "convert %f -font Helvetica -pointsize 20 -fill white  -box '#00000080'  -gravity South -annotate +0+5 ' Copyright 2007, Your Name Here ' %n-copyright%e"},
 	{N_("Copy to \"approved\" folder"), "mkdir -p %p/approved ; cp %f %p/approved/"},
 	{N_("Send by email"), "uuencode %f %f | mail -s Photos your emailaddress com"},

Modified: trunk/src/gth-browser.c
==============================================================================
--- trunk/src/gth-browser.c	(original)
+++ trunk/src/gth-browser.c	Wed Oct  8 19:09:55 2008
@@ -3115,7 +3115,7 @@
 	case GDK_g:
 		list = gth_window_get_file_list_selection (window);
 		if (list != NULL) {
-			exec_command ("gimp-remote", list);
+			exec_command ("gimp", list);
 			path_list_free (list);
 		}