gimp r25194 - in trunk: . plug-ins plug-ins/FractalExplorer plug-ins/Lighting plug-ins/MapObject plug-ins/colormap-rotate plug-ins/fli plug-ins/fractal-explorer plug-ins/gflare plug-ins/gfli plug-ins/gradient-flare plug-ins/help-browser plug-ins/helpbrowser plug-ins/ifs-compose plug-ins/ifscompose plug-ins/lighting plug-ins/map-object plug-ins/rcm plug-ins/sel2path plug-ins/selection-to-path plug-ins/win-icon plug-ins/win-snap plug-ins/winicon plug-ins/winsnap

[mitch svn gnome org]

Author: mitch
Date: Mon Mar 24 16:36:03 2008
New Revision: 25194
URL: http://svn.gnome.org/viewvc/gimp?rev=25194&view=rev

Log:
2008-03-24  Michael Natterer  <mitch gimp org>

	Renamed folders in plug-ins/. Unfortunately it's impossible to
	rename the files inside at the same time, so this is just
	part one...

	* plug-ins/FractalExplorer -> fractal-explorer
	* plug-ins/Lighting -> lighting
	* plug-ins/MapObject -> map-object
	* plug-ins/gflare -> gradient-flare
	* plug-ins/gfli -> fli
	* plug-ins/helpbrowser -> help-browser
	* plug-ins/ifscompose -> ifs-compose
	* plug-ins/rcm -> colormap-rotate
	* plug-ins/sel2path -> selection-to-path
	* plug-ins/winicon -> win-icon
	* plug-ins/winsnap -> win-snap

	* configure.in
	* plug-ins/Makefile.am: changed accordingly.



Added:
   trunk/plug-ins/colormap-rotate/
      - copied from r25191, /trunk/plug-ins/rcm/
   trunk/plug-ins/fli/
      - copied from r25191, /trunk/plug-ins/gfli/
   trunk/plug-ins/fractal-explorer/
      - copied from r25191, /trunk/plug-ins/FractalExplorer/
   trunk/plug-ins/gradient-flare/
      - copied from r25191, /trunk/plug-ins/gflare/
   trunk/plug-ins/help-browser/
      - copied from r25191, /trunk/plug-ins/helpbrowser/
   trunk/plug-ins/ifs-compose/
      - copied from r25191, /trunk/plug-ins/ifscompose/
   trunk/plug-ins/lighting/
      - copied from r25191, /trunk/plug-ins/Lighting/
   trunk/plug-ins/map-object/
      - copied from r25191, /trunk/plug-ins/MapObject/
   trunk/plug-ins/selection-to-path/
      - copied from r25191, /trunk/plug-ins/sel2path/
   trunk/plug-ins/win-icon/
      - copied from r25191, /trunk/plug-ins/winicon/
   trunk/plug-ins/win-snap/
      - copied from r25191, /trunk/plug-ins/winsnap/
Removed:
   trunk/plug-ins/FractalExplorer/
   trunk/plug-ins/Lighting/
   trunk/plug-ins/MapObject/
   trunk/plug-ins/gflare/
   trunk/plug-ins/gfli/
   trunk/plug-ins/helpbrowser/
   trunk/plug-ins/ifscompose/
   trunk/plug-ins/rcm/
   trunk/plug-ins/sel2path/
   trunk/plug-ins/winicon/
   trunk/plug-ins/winsnap/
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plug-ins/Makefile.am
   trunk/plug-ins/map-object/mapobject_stock.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Mar 24 16:36:03 2008
@@ -1208,7 +1208,7 @@
   have_gtkhtml2="no (GtkHtml2 support disabled)"
 fi
 
-AM_CONDITIONAL(BUILD_HELPBROWSER, test "x$have_gtkhtml2" = xyes)
+AM_CONDITIONAL(BUILD_HELP_BROWSER, test "x$have_gtkhtml2" = xyes)
 
 
 ###################
@@ -1959,39 +1959,34 @@
 app/widgets/Makefile
 app/xcf/Makefile
 plug-ins/Makefile
-plug-ins/script-fu/Makefile
-plug-ins/script-fu/ftx/Makefile
-plug-ins/script-fu/re/Makefile
-plug-ins/script-fu/tinyscheme/Makefile
-plug-ins/script-fu/scripts/Makefile
-plug-ins/script-fu/scripts/images/Makefile
-plug-ins/xjt/Makefile
-plug-ins/FractalExplorer/Makefile
-plug-ins/FractalExplorer/examples/Makefile
-plug-ins/Lighting/Makefile
-plug-ins/Lighting/images/Makefile
-plug-ins/MapObject/Makefile
 plug-ins/bmp/Makefile
+plug-ins/colormap-rotate/Makefile
+plug-ins/colormap-rotate/images/Makefile
 plug-ins/common/Makefile
 plug-ins/faxg3/Makefile
 plug-ins/fits/Makefile
 plug-ins/flame/Makefile
+plug-ins/fli/Makefile
+plug-ins/fractal-explorer/Makefile
+plug-ins/fractal-explorer/examples/Makefile
 plug-ins/gfig/Makefile
 plug-ins/gfig/gfig-examples/Makefile
 plug-ins/gfig/images/Makefile
-plug-ins/gflare/Makefile
-plug-ins/gflare/gflares/Makefile
-plug-ins/gfli/Makefile
-plug-ins/gimpressionist/Makefile
+plug-ins/gradient-flare/Makefile
+plug-ins/gradient-flare/gflares/Makefile
 plug-ins/gimpressionist/Brushes/Makefile
+plug-ins/gimpressionist/Makefile
 plug-ins/gimpressionist/Paper/Makefile
 plug-ins/gimpressionist/Presets/Makefile
+plug-ins/help-browser/Makefile
 plug-ins/help/Makefile
-plug-ins/helpbrowser/Makefile
-plug-ins/ifscompose/Makefile
+plug-ins/ifs-compose/Makefile
 plug-ins/imagemap/Makefile
 plug-ins/imagemap/images/Makefile
 plug-ins/jpeg/Makefile
+plug-ins/lighting/Makefile
+plug-ins/lighting/images/Makefile
+plug-ins/map-object/Makefile
 plug-ins/maze/Makefile
 plug-ins/metadata/Makefile
 plug-ins/pagecurl/Makefile
@@ -1999,14 +1994,19 @@
 plug-ins/psd/Makefile
 plug-ins/pygimp/Makefile
 plug-ins/pygimp/plug-ins/Makefile
-plug-ins/rcm/Makefile
-plug-ins/rcm/images/Makefile
-plug-ins/sel2path/Makefile
+plug-ins/script-fu/Makefile
+plug-ins/script-fu/ftx/Makefile
+plug-ins/script-fu/re/Makefile
+plug-ins/script-fu/scripts/Makefile
+plug-ins/script-fu/scripts/images/Makefile
+plug-ins/script-fu/tinyscheme/Makefile
+plug-ins/selection-to-path/Makefile
 plug-ins/sgi/Makefile
 plug-ins/twain/Makefile
 plug-ins/uri/Makefile
-plug-ins/winicon/Makefile
-plug-ins/winsnap/Makefile
+plug-ins/win-icon/Makefile
+plug-ins/win-snap/Makefile
+plug-ins/xjt/Makefile
 modules/Makefile
 devel-docs/Makefile
 devel-docs/app/Makefile

Modified: trunk/plug-ins/Makefile.am
==============================================================================
--- trunk/plug-ins/Makefile.am	(original)
+++ trunk/plug-ins/Makefile.am	Mon Mar 24 16:36:03 2008
@@ -4,8 +4,8 @@
 	makefile.msc
 
 
-if BUILD_HELPBROWSER
-helpbrowser = helpbrowser
+if BUILD_HELP_BROWSER
+help_browser = help-browser
 endif
 
 if BUILD_JPEG
@@ -29,12 +29,12 @@
 endif
 
 if HAVE_PNG
-winicon = winicon
+win_icon = win-icon
 endif
 
 if OS_WIN32
 twain = twain
-winsnap = winsnap
+win_snap = win-snap
 if HAVE_LIBCURL
 uri = uri
 endif
@@ -49,34 +49,34 @@
 
 SUBDIRS = \
 	$(script_fu)		\
-	FractalExplorer		\
-	Lighting		\
-	MapObject		\
+	$(pygimp)		\
 	bmp			\
+	colormap-rotate		\
 	faxg3			\
 	fits			\
 	flame			\
+	fli			\
+	fractal-explorer	\
 	gfig			\
-	gflare			\
-	gfli			\
 	gimpressionist		\
+	gradient-flare		\
 	help			\
-	$(helpbrowser)		\
-	ifscompose		\
+	$(help_browser)		\
+	ifs-compose		\
 	imagemap		\
 	$(jpeg)                 \
+	lighting		\
+	map-object		\
 	maze			\
 	metadata		\
 	pagecurl		\
 	$(print)		\
-	$(pygimp)		\
 	psd			\
-	rcm			\
+	selection-to-path	\
 	sgi			\
-	sel2path		\
 	$(twain)		\
 	$(uri)			\
-	$(winicon)		\
-	$(winsnap)		\
+	$(win_icon)		\
+	$(win_snap)		\
 	$(xjt)			\
 	common

Modified: trunk/plug-ins/map-object/mapobject_stock.c
==============================================================================
--- /trunk/plug-ins/MapObject/mapobject_stock.c	(original)
+++ trunk/plug-ins/map-object/mapobject_stock.c	Mon Mar 24 16:36:03 2008
@@ -22,7 +22,7 @@
 
 #include "mapobject_stock.h"
 
-#include "../Lighting/images/stock-pixbufs.h"
+#include "../lighting/images/stock-pixbufs.h"
 
 
 static GtkIconFactory *mapobject_icon_factory = NULL;