[sane-devel] [PATCH] Move xscanimage and xsane menu entries in GIMP

[Julien BLACHE]

Hi,

A couple of people have asked for the xscanimage menu entries in GIMP
to be moved to File/Acquire, along with XSane's ones.

Here are two patches :
 - for xscanimage, move the entries to File/Acquire/xscanimage/*
 - for XSane, move the entries to File/Acquire/XSane/*

So both will have a dedicated submenu, and we won't end up with a
zillion of items in File/Acquire.

Please apply,

JB.

-- 
Julien BLACHE                                   <http://www.jblache.org> 
<jb at jblache.org> 

-------------- next part --------------
--- sane-frontends-1.0.9.orig/src/xscanimage.c
+++ sane-frontends-1.0.9/src/xscanimage.c
@@ -284,7 +284,7 @@
       "Andy Beck, Tristan Tarrant, and David Mosberger",
       "Andy Beck, Tristan Tarrant, and David Mosberger",
       "8th June 1997",
-      "<Toolbox>/Xtns/Acquire Image/Device dialog...",
+      "<Toolbox>/File/Acquire/xscanimage/Device dialog...",
       "RGB, GRAY",
       GIMP_EXTENSION,
       nargs, nreturn_vals,
@@ -299,7 +299,7 @@
       if (encode_devname (devlist[i]->name, sizeof (name) - 11, name + 11) < 0)
 	continue;	/* name too long... */
 
-      strncpy (mpath, "<Toolbox>/Xtns/Acquire Image/", sizeof (mpath));
+      strncpy (mpath, "<Toolbox>/File/Acquire/xscanimage/", sizeof (mpath));
       len = strlen (mpath);
       for (j = 0; devlist[i]->name[j]; ++j)
 	{
-------------- next part --------------
--- xsane-0.90.orig/src/xsane-text.h
+++ xsane-0.90/src/xsane-text.h
@@ -726,8 +726,8 @@
 #define XSANE_GIMP_INSTALL_HELP		_("This function provides access to scanners and other image acquisition devices through the SANE (Scanner Access Now Easy) interface.")
 
 /* Menu path must not be translated, this is done by the gimp. Only translate the text behind the last "/" */
-#define XSANE_GIMP_MENU_DIALOG		_("<Toolbox>/File/Acquire/XSane: Device dialog...")
-#define XSANE_GIMP_MENU			_("<Toolbox>/File/Acquire/XSane: ")
+#define XSANE_GIMP_MENU_DIALOG		_("<Toolbox>/File/Acquire/XSane/Device dialog...")
+#define XSANE_GIMP_MENU			_("<Toolbox>/File/Acquire/XSane/")
 #define XSANE_GIMP_MENU_DIALOG_OLD	_("<Toolbox>/Xtns/XSane/Device dialog...")
 #define XSANE_GIMP_MENU_OLD		_("<Toolbox>/Xtns/XSane/")