[gnome-scan/gnome-scan-0-6: 8/23] Port to Gimp 2.6

[Philipp Sadleder <phsadleder src gnome org>]

commit 5cc6c7e6f554bf99b96111ee23799cecc11ef204
Author: Ã?tienne Bersac <bersace src gnome org>
Date:   Sat Dec 6 14:20:29 2008 +0000

    Port to Gimp 2.6
    
    svn path=/branches/GNOME_SCAN_0_6/; revision=646
---
 ChangeLog          |    5 +++++
 src/Makefile.am    |    8 ++++----
 src/flegita-gimp.c |    5 +++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1c67712..9a7a0a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* NEWS:
 	* configure.ac: Release 0.6.1
 
+2008-12-06  Ã?tienne BERSAC  <bersace03 laposte net>
+
+	* src/Makefile.am:
+	* src/flegita-gimp.c: Port to Gimp 2.6 new menu layout.
+
 2008-12-06  Deji Akingunola  <dakingun gmail com>
 
 	* lib/gnome-scan-dialog.c (gsd_probe_done):
diff --git a/src/Makefile.am b/src/Makefile.am
index d8d47f0..ce55c73 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,11 +70,11 @@ flegita_gimp_LDFLAGS = \
 	-L$(top_builddir)/lib -l SONAME@
 
 
-
+GIMPVERSION=2.6
 quick: $(libgimp_PROGRAMS)
-	mkdir -p ~/.gimp-2.3/plug-ins/.libs/
-	cp -r $(bin_PROGRAMS) ~/.gimp-2.2/plug-ins/
-	cp -r .libs/* ~/.gimp-2.3/plug-ins/.libs/
+	mkdir -p ~/.gimp-$(GIMPVERSION)/plug-ins/.libs/
+	cp -r $(libgimp_PROGRAMS) ~/.gimp-$(GIMPVERSION)/plug-ins/
+	cp -r .libs/* ~/.gimp-$(GIMPVERSION)/plug-ins/.libs/
 
 
 EXTRA_DIST = \
diff --git a/src/flegita-gimp.c b/src/flegita-gimp.c
index 646dcfa..a5ff709 100644
--- a/src/flegita-gimp.c
+++ b/src/flegita-gimp.c
@@ -97,7 +97,12 @@ query (void)
 			  G_N_ELEMENTS (scan_args), G_N_ELEMENTS (scan_return),
 			  scan_args, scan_return);
 
+#if GIMP_MINOR_VERSION >= 5
+  gimp_plugin_menu_register (PROCEDURE_SCAN, "<Image>/File/Open");
+#else
   gimp_plugin_menu_register (PROCEDURE_SCAN, "<Toolbox>/File/Acquire");
+#endif
+
   gimp_plugin_icon_register (PROCEDURE_SCAN, GIMP_ICON_TYPE_IMAGE_FILE, ACTION_ICON_DIR "/scan.svg");
 
   gimp_install_procedure (PROCEDURE_SCAN_AS_LAYER,