mostly header cleanup and i18n

--Sven

ChangeLog

@@ -1,3 +1,16 @@
+Tue Feb  1 22:42:26 CET 2000
+
+	* app/regex.c
+	* plug-ins/script-fu/regex.c: remove occurences of gettext, since 
+	we don't translate error messages
+
+	* app/[lotsa files]: only include libgimp/gimpintl.h if needed; but 
+	if it gets included, include config.h too
+
+	* po/POTFILES.in
+	* po-plug-ins/POTFILES.in: only list files that mark strings for 
+	translation
+
 2000-02-01  Michael Natterer  <mitch@gimp.org>
 
 	* app/menus.c

app/actions/help-commands.c

@@ -56,6 +56,7 @@
 #include "tools.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define return_if_no_display(gdisp) \

app/airbrush.c

@@ -32,6 +32,7 @@
 #include "selection.h"
 #include "tools.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 /*  The maximum amount of pressure that can be exerted  */

app/base/boundary.c

@@ -21,8 +21,6 @@
 #include "boundary.h"
 #include "tile.h"
 
-#include "libgimp/gimpintl.h"
-
 /* half intensity for mask */
 #define HALF_WAY 127
 

app/base/color-balance.c

@@ -23,6 +23,7 @@
 #include "gimpui.h"
 #include "image_map.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimpmath.h"
 #include "libgimp/gimpcolorspace.h"

app/base/curves.c

@@ -26,6 +26,7 @@
 #include "curves.h"
 #include "gimplut.h"
 
+#include "config.h"
 #include "libgimp/gimpenv.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimpmath.h"

app/base/hue-saturation.c

@@ -29,6 +29,7 @@
 #include "hue_saturation.h"
 #include "interface.h"
 
+#include "config.h"
 #include "libgimp/gimpcolorspace.h"
 #include "libgimp/gimpintl.h"
 

app/base/temp-buf.c

@@ -43,7 +43,6 @@
 #include "temp_buf.h"
 
 #include "libgimp/gimpcolorspace.h"
-#include "libgimp/gimpintl.h"
 
 static unsigned char *   temp_buf_allocate (unsigned int);
 static void              temp_buf_to_color (TempBuf *, TempBuf *);

app/base/threshold.c

@@ -23,6 +23,7 @@
 #include "interface.h"
 #include "threshold.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define HISTOGRAM_WIDTH  256

app/base/tile-cache.c

@@ -10,8 +10,6 @@
 
 #include "tile_pvt.h"			/* ick. */
 
-#include "libgimp/gimpintl.h"
-
 #include "stdio.h"
 
 /*  This is the percentage of the maximum cache size that should be cleared

app/base/tile-manager.c

@@ -25,8 +25,6 @@
 #include "tile_manager_pvt.h"
 #include "tile_pvt.h"			/* ick. */
 
-#include "libgimp/gimpintl.h"
-
 
 static int tile_manager_get_tile_num (TileManager *tm,
 				       int xpixel,

app/base/tile-swap.c

@@ -26,8 +26,6 @@
 #define _O_TEMPORARY 0
 #endif
 
-#include "libgimp/gimpintl.h"
-
 #define MAX_OPEN_SWAP_FILES  16
 
 #include "tile.h"

app/base/tile.c

@@ -6,8 +6,6 @@
 #include "tile_manager.h"
 #include "tile_swap.h"
 
-#include "libgimp/gimpintl.h"
-
 
 static void tile_destroy (Tile *tile);
 

app/batch.c

@@ -1,3 +1,20 @@
+/* The GIMP -- an image manipulation program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
 #include "config.h"
 
 #include <ctype.h>
@@ -14,8 +31,6 @@
 #include "batch.h"
 #include "procedural_db.h"
 
-#include "libgimp/gimpintl.h"
-
 static void batch_run_cmd  (char              *cmd);
 static void batch_read     (gpointer           data,
 			    gint               source,

app/boundary.c

@@ -21,8 +21,6 @@
 #include "boundary.h"
 #include "tile.h"
 
-#include "libgimp/gimpintl.h"
-
 /* half intensity for mask */
 #define HALF_WAY 127
 

app/brightness_contrast.c

@@ -24,6 +24,7 @@
 #include "image_map.h"
 #include "lut_funcs.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define SLIDER_WIDTH 200

app/brush_edit.c

@@ -25,6 +25,7 @@
 #include "brush_edit.h"
 #include "gimpui.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 static void brush_edit_close_callback (GtkWidget *, gpointer);

app/brush_select.c

@@ -34,6 +34,7 @@
 #include "paint_options.h"
 #include "session.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define MIN_CELL_SIZE     25

app/bucket_fill.c

@@ -34,6 +34,7 @@
 #include "tools.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 /*  the bucket fill structures  */

app/by_color_select.c

@@ -31,6 +31,7 @@
 
 #include "tile.h"			/* ick. */
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define DEFAULT_FUZZINESS    15

app/channel_ops.c

@@ -27,6 +27,7 @@
 #include "gimpui.h"
 #include "interface.h"
 
+#include "config.h"
 #include "libgimp/gimpsizeentry.h"
 #include "libgimp/gimpmath.h"
 #include "libgimp/gimpintl.h"

app/channels_dialog.c

@@ -35,6 +35,7 @@
 #include "paint_funcs.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #include "pixmaps/eye.xbm"

app/color_balance.c

@@ -23,6 +23,7 @@
 #include "gimpui.h"
 #include "image_map.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimpmath.h"
 #include "libgimp/gimpcolorspace.h"

app/color_picker.c

@@ -28,6 +28,7 @@
 #include "tools.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 /*  maximum information buffer size  */

app/colormap_dialog.i.c

@@ -14,6 +14,7 @@
 #include "gimpdnd.h"
 #include "gimpui.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 /*  Add these features:

app/commands.c

@@ -56,6 +56,7 @@
 #include "tools.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define return_if_no_display(gdisp) \

app/convolve.c

@@ -32,6 +32,7 @@
 #include "tools.h"
 #include "gimage.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define FIELD_COLS    4

app/core/gimp-edit.c

@@ -30,6 +30,7 @@
 #include "tools.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #include "tile_manager_pvt.h"

app/core/gimpbrush-load.c

@@ -25,6 +25,7 @@
 #include "gimprc.h"
 #include "brush_header.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 enum{

app/core/gimpbrush.c

@@ -25,6 +25,7 @@
 #include "gimprc.h"
 #include "brush_header.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 enum{

app/core/gimpcontext.c

@@ -28,8 +28,6 @@
 #include "gradient_header.h"
 #include "patterns.h"
 
-#include "libgimp/gimpintl.h"
-
 #define context_return_if_fail(context) \
         g_return_if_fail ((context) != NULL); \
         g_return_if_fail (GIMP_IS_CONTEXT (context))

app/core/gimpdrawable-desaturate.c

@@ -21,6 +21,7 @@
 #include "paint_funcs.h"
 #include "gimage.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 void

app/core/gimpdrawable-equalize.c

@@ -22,6 +22,7 @@
 #include "lut_funcs.h"
 #include "gimphistogram.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 void

app/core/gimpdrawable-invert.c

@@ -26,6 +26,7 @@
 #include "gimplut.h"
 #include "lut_funcs.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 

app/core/gimpdrawable-offset.c

@@ -27,6 +27,7 @@
 #include "gimpui.h"
 #include "interface.h"
 
+#include "config.h"
 #include "libgimp/gimpsizeentry.h"
 #include "libgimp/gimpmath.h"
 #include "libgimp/gimpintl.h"

app/core/gimpdrawable.c

@@ -26,6 +26,7 @@
 #include "parasitelist.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/parasite.h"
 #include "libgimp/gimpintl.h"
 

app/core/gimpedit.c

@@ -30,6 +30,7 @@
 #include "tools.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #include "tile_manager_pvt.h"

app/core/gimpimage-duplicate.c

@@ -27,6 +27,7 @@
 #include "gimpui.h"
 #include "interface.h"
 
+#include "config.h"
 #include "libgimp/gimpsizeentry.h"
 #include "libgimp/gimpmath.h"
 #include "libgimp/gimpintl.h"

app/core/gimpimage-guides.c

@@ -33,6 +33,7 @@
 #include "pathsP.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpcolorspace.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimplimits.h"

app/core/gimpimage-mask.c

@@ -30,6 +30,7 @@
 #include "paint_options.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #include "layer_pvt.h"

app/core/gimpimage-merge.c

@@ -33,6 +33,7 @@
 #include "pathsP.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpcolorspace.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimplimits.h"

app/core/gimpimage-projection.c

@@ -33,6 +33,7 @@
 #include "pathsP.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpcolorspace.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimplimits.h"

app/core/gimpimage-resize.c

@@ -33,6 +33,7 @@
 #include "pathsP.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpcolorspace.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimplimits.h"

app/core/gimpimage-scale.c

@@ -33,6 +33,7 @@
 #include "pathsP.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpcolorspace.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimplimits.h"

app/core/gimpimage.c

@@ -33,6 +33,7 @@
 #include "pathsP.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpcolorspace.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimplimits.h"

app/core/gimpimagemap.c

@@ -29,8 +29,6 @@
 
 #include "tile_manager_pvt.h"
 
-#include "libgimp/gimpintl.h"
-
 #define WAITING 0
 #define WORKING 1
 

app/core/gimplayer-floating-sel.c

@@ -30,6 +30,7 @@
 #include "paint_funcs.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #include "layer_pvt.h"

app/core/gimplayer.c

@@ -35,7 +35,7 @@
 #include "gimpsignal.h"
 #include "gimppreviewcache.h"
 
-
+#include "config.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/parasite.h"
 

app/core/gimpprojection-construct.c

@@ -33,6 +33,7 @@
 #include "pathsP.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpcolorspace.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimplimits.h"

app/core/gimpscanconvert.c

@@ -20,7 +20,6 @@
 
 #include "scan_convert.h"
 #include "libgimp/gimpmath.h"
-#include "libgimp/gimpintl.h"
 
 
 #ifdef DEBUG

app/crop.c

@@ -32,6 +32,7 @@
 #include "info_dialog.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpsizeentry.h"
 #include "libgimp/gimpintl.h"
 

app/curves.c

@@ -26,6 +26,7 @@
 #include "curves.h"
 #include "gimplut.h"
 
+#include "config.h"
 #include "libgimp/gimpenv.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimpmath.h"

app/desaturate.c

@@ -21,6 +21,7 @@
 #include "paint_funcs.h"
 #include "gimage.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 void

app/dialogs/image-new-dialog.c

@@ -20,6 +20,7 @@
 #include "gimpui.h"
 #include "gdisplay.h"
 
+#include "config.h"
 #include "libgimp/gimpchainbutton.h"
 #include "libgimp/gimplimits.h"
 #include "libgimp/gimpsizeentry.h"

app/display/gimpdisplay-ops.c

@@ -29,6 +29,7 @@
 #include "scale.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 static void gdisplay_close_warning_callback  (GtkWidget *, gpointer);

app/display/gimpdisplayshell-filter-dialog.c

@@ -15,6 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+#include "config.h"
 #include "color_area.h"
 #include "gdisplay.h"
 #include "gdisplay_color.h"

app/display/gimpdisplayshell-filter.c

@@ -27,7 +27,6 @@
 #include "gimpui.h"
 
 #include "libgimp/parasite.h"
-#include "libgimp/gimpintl.h"
 
 #include <gtk/gtk.h>
 

app/display/gimpdisplayshell-layer-select.c

@@ -26,6 +26,7 @@
 #include "layer_select.h"
 #include "layers_dialogP.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 

app/display/gimpprogress.c

@@ -15,6 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+#include "config.h"
 #include "appenv.h"
 #include "gdisplay.h"
 #include "libgimp/gimpintl.h"

app/docindex.c

@@ -22,6 +22,7 @@
 #include "gimpdnd.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpenv.h"
 #include "libgimp/gimpintl.h"
 

app/docindexif.c

@@ -21,6 +21,7 @@
 #include "gimage.h"
 #include "gimphelp.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 void

app/drawable.c

@@ -22,8 +22,6 @@
 #include "gdisplay.h"
 #include "undo.h"
 
-#include "libgimp/gimpintl.h"
-
 gint
 drawable_ID (GimpDrawable *drawable)
 {

app/edit_selection.c

@@ -30,6 +30,7 @@
 #include "gimprc.h"
 #include "paths_dialogP.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define EDIT_SELECT_SCROLL_LOCK FALSE

app/ellipse_select.c

@@ -26,8 +26,6 @@
 #include "rect_selectP.h"
 #include "selection_options.h"
 
-#include "libgimp/gimpintl.h"
-
 
 /*  the ellipse selection tool options  */
 SelectionOptions * ellipse_options = NULL;

app/equalize.c

@@ -22,6 +22,7 @@
 #include "lut_funcs.h"
 #include "gimphistogram.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 void

app/eraser.c

@@ -33,6 +33,7 @@
 #include "selection.h"
 #include "tools.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 /* Defaults */

app/errors.c

@@ -40,8 +40,6 @@
 #include "errors.h"
 #include "gimpui.h"
 
-#include "libgimp/gimpintl.h"
-
 #ifdef G_OS_WIN32
 #include <windows.h>
 #endif

app/file_new_dialog.c

@@ -20,6 +20,7 @@
 #include "gimpui.h"
 #include "gdisplay.h"
 
+#include "config.h"
 #include "libgimp/gimpchainbutton.h"
 #include "libgimp/gimplimits.h"
 #include "libgimp/gimpsizeentry.h"

app/flip_tool.c

@@ -32,6 +32,7 @@
 #include "undo.h"
 #include "gimage.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #include "tile_manager_pvt.h"		/* ick. */

app/floating_sel.c

@@ -30,6 +30,7 @@
 #include "paint_funcs.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #include "layer_pvt.h"

app/free_select.c

@@ -28,7 +28,6 @@
 #include "selection_options.h"
 #include "scan_convert.h"
 
-#include "libgimp/gimpintl.h"
 #include "libgimp/gimpmath.h"
 
 #define DEFAULT_MAX_INC  1024

app/gdisplay_color.c

@@ -27,7 +27,6 @@
 #include "gimpui.h"
 
 #include "libgimp/parasite.h"
-#include "libgimp/gimpintl.h"
 
 #include <gtk/gtk.h>
 

app/gdisplay_color_ui.c

@@ -15,6 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+#include "config.h"
 #include "color_area.h"
 #include "gdisplay.h"
 #include "gdisplay_color.h"

app/gdisplay_ops.c

@@ -29,6 +29,7 @@
 #include "scale.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 static void gdisplay_close_warning_callback  (GtkWidget *, gpointer);

app/gimage_mask.c

@@ -30,6 +30,7 @@
 #include "paint_options.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #include "layer_pvt.h"

app/gimpbrush.c

@@ -25,6 +25,7 @@
 #include "gimprc.h"
 #include "brush_header.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 enum{

app/gimpbrushlist.c

@@ -44,8 +44,6 @@
 #include "gimpbrushlistP.h"
 #include "general.h"
 
-#include "libgimp/gimpintl.h"
-
 /*  global variables  */
 GimpBrushList    *brush_list     = NULL;
 

app/gimpcontext.c

@@ -28,8 +28,6 @@
 #include "gradient_header.h"
 #include "patterns.h"
 
-#include "libgimp/gimpintl.h"
-
 #define context_return_if_fail(context) \
         g_return_if_fail ((context) != NULL); \
         g_return_if_fail (GIMP_IS_CONTEXT (context))

app/gimpdrawable-desaturate.c

@@ -21,6 +21,7 @@
 #include "paint_funcs.h"
 #include "gimage.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 void

app/gimpdrawable-equalize.c

@@ -22,6 +22,7 @@
 #include "lut_funcs.h"
 #include "gimphistogram.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 void

app/gimpdrawable-invert.c

@@ -26,6 +26,7 @@
 #include "gimplut.h"
 #include "lut_funcs.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 

app/gimpdrawable-offset.c

@@ -27,6 +27,7 @@
 #include "gimpui.h"
 #include "interface.h"
 
+#include "config.h"
 #include "libgimp/gimpsizeentry.h"
 #include "libgimp/gimpmath.h"
 #include "libgimp/gimpintl.h"

app/gimpdrawable.c

@@ -26,6 +26,7 @@
 #include "parasitelist.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/parasite.h"
 #include "libgimp/gimpintl.h"
 

app/gimpimage-duplicate.c

@@ -27,6 +27,7 @@
 #include "gimpui.h"
 #include "interface.h"
 
+#include "config.h"
 #include "libgimp/gimpsizeentry.h"
 #include "libgimp/gimpmath.h"
 #include "libgimp/gimpintl.h"

app/gimpimage.c

@@ -33,6 +33,7 @@
 #include "pathsP.h"
 #include "gimprc.h"
 
+#include "config.h"
 #include "libgimp/gimpcolorspace.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/gimplimits.h"

app/gimplayer.c

@@ -35,7 +35,7 @@
 #include "gimpsignal.h"
 #include "gimppreviewcache.h"
 
-
+#include "config.h"
 #include "libgimp/gimpintl.h"
 #include "libgimp/parasite.h"
 

app/gimpprogress.c

@@ -15,6 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+#include "config.h"
 #include "appenv.h"
 #include "gdisplay.h"
 #include "libgimp/gimpintl.h"

app/global_edit.c

@@ -30,6 +30,7 @@
 #include "tools.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #include "tile_manager_pvt.h"

app/gradient_select.c

@@ -43,6 +43,7 @@
 #include "gradient_select.h"
 #include "session.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 static void gradient_change_callbacks            (GradientSelect *gsp,

app/gui/brush-editor.c

@@ -25,6 +25,7 @@
 #include "brush_edit.h"
 #include "gimpui.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 static void brush_edit_close_callback (GtkWidget *, gpointer);

app/gui/brush-select.c

@@ -34,6 +34,7 @@
 #include "paint_options.h"
 #include "session.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define MIN_CELL_SIZE     25

app/gui/channels-dialog.c

@@ -35,6 +35,7 @@
 #include "paint_funcs.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #include "pixmaps/eye.xbm"

app/gui/commands.c

@@ -56,6 +56,7 @@
 #include "tools.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define return_if_no_display(gdisp) \

app/gui/file-new-dialog.c

@@ -20,6 +20,7 @@
 #include "gimpui.h"
 #include "gdisplay.h"
 
+#include "config.h"
 #include "libgimp/gimpchainbutton.h"
 #include "libgimp/gimplimits.h"
 #include "libgimp/gimpsizeentry.h"

app/gui/gradient-select.c

@@ -43,6 +43,7 @@
 #include "gradient_select.h"
 #include "session.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 static void gradient_change_callbacks            (GradientSelect *gsp,

app/gui/help-commands.c

@@ -56,6 +56,7 @@
 #include "tools.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define return_if_no_display(gdisp) \

app/gui/indicator-area.c

@@ -26,6 +26,7 @@
 #include "indicator_area.h"
 #include "pattern_select.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 #define CELL_SIZE        23  /*  The size of the previews  */

app/gui/layer-select.c

@@ -26,6 +26,7 @@
 #include "layer_select.h"
 #include "layers_dialogP.h"
 
+#include "config.h"
 #include "libgimp/gimpintl.h"
 
 

app/gui/layers-dialog.c

@@ -38,6 +38,7 @@
 #include "resize.h"
 #include "undo.h"
 
+#include "config.h"
 #include "libgimp/gimplimits.h"
 #include "libgimp/gimpsizeentry.h"
 

app/gui/menus.c

@@ -540,6 +540,13 @@ static GimpItemFactoryEntry image_entries[] =
   { { "/Tools/---", NULL, NULL, 0, "<Separator>" },  
     NULL, NULL },
 
+  { { N_("/Tools/Select Tools"), NULL, NULL, 0, "<Branch>" },
+    NULL, NULL },
+  { { N_("/Tools/Transform Tools"), NULL, NULL, 0, "<Branch>" },
+    NULL, NULL },
+  { { N_("/Tools/Paint Tools"), NULL, NULL, 0, "<Branch>" },
+    NULL, NULL },
+
   /*  <Image>/Dialogs  */
 
   { { N_("/Dialogs"), NULL, NULL, 0, "<Branch>" },
@@ -1607,8 +1614,6 @@ menus_init (void)
   GtkWidget *menu_item;
   gchar     *filename;
   gint       i;
-  GimpItemFactoryEntry tool_separator = 
-  { { "/Tools/---", NULL, NULL, 0, "<Separator>" }, NULL, NULL };
 
   if (! initialize)
     return;
@@ -1690,13 +1695,6 @@ menus_init (void)
 
   for (i = 0; i < num_tools; i++)
     {
-      /* insert separators between tool_groups */
-      if (tool_info[i].tool_id == TEXT ||
-	  tool_info[i].tool_id == BUCKET_FILL ||
-	  tool_info[i].tool_id == MEASURE)
-	{
-	  menus_create_item (image_factory, &tool_separator, NULL, 2);
-	}
       /* FIXME this need to use access functions to check a flag */
       if (tool_info[i].menu_path)
 	menus_tools_create (&tool_info[i]);