gnome-scan r646 - in branches/GNOME_SCAN_0_6: . src

[bersace svn gnome org]

Author: bersace
Date: Sat Dec  6 14:20:29 2008
New Revision: 646
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=646&view=rev

Log:
Port to Gimp 2.6

Modified:
   branches/GNOME_SCAN_0_6/ChangeLog
   branches/GNOME_SCAN_0_6/src/Makefile.am
   branches/GNOME_SCAN_0_6/src/flegita-gimp.c

Modified: branches/GNOME_SCAN_0_6/src/Makefile.am
==============================================================================
--- branches/GNOME_SCAN_0_6/src/Makefile.am	(original)
+++ branches/GNOME_SCAN_0_6/src/Makefile.am	Sat Dec  6 14:20:29 2008
@@ -70,11 +70,11 @@
 	-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 = \

Modified: branches/GNOME_SCAN_0_6/src/flegita-gimp.c
==============================================================================
--- branches/GNOME_SCAN_0_6/src/flegita-gimp.c	(original)
+++ branches/GNOME_SCAN_0_6/src/flegita-gimp.c	Sat Dec  6 14:20:29 2008
@@ -97,7 +97,12 @@
 			  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,