Applied Sven's menu patch

-Yosh

ChangeLog

@@ -1,3 +1,7 @@
+Sat Jan 24 18:16:35 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* applied Sven's menu patch
+
 Sat Jan 24 17:23:13 PST 1998 Manish Singh <yosh@gimp.org>
 
 	* app/indexed_palette.c: fix for wrong color selected in indexed

app/core/gimpprojection.c

@@ -1014,8 +1014,7 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
   menus_set_sensitive ("<Image>/Edit/Stroke", lp);
   menus_set_sensitive ("<Image>/Edit/Cut Named", lp);
   menus_set_sensitive ("<Image>/Edit/Copy Named", lp);
-  menus_set_sensitive ("<Image>/Image/Map", lp);
-  menus_set_sensitive ("<Image>/Image/Adjust", lp);
+  menus_set_sensitive ("<Image>/Image/Colors", lp);
   menus_set_sensitive ("<Image>/Image/Channel Ops/Offset", lp);
   menus_set_sensitive ("<Image>/Image/Histogram", lp);
   menus_set_sensitive ("<Image>/Filters", lp);

app/display/gimpdisplay.c

@@ -1014,8 +1014,7 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
   menus_set_sensitive ("<Image>/Edit/Stroke", lp);
   menus_set_sensitive ("<Image>/Edit/Cut Named", lp);
   menus_set_sensitive ("<Image>/Edit/Copy Named", lp);
-  menus_set_sensitive ("<Image>/Image/Map", lp);
-  menus_set_sensitive ("<Image>/Image/Adjust", lp);
+  menus_set_sensitive ("<Image>/Image/Colors", lp);
   menus_set_sensitive ("<Image>/Image/Channel Ops/Offset", lp);
   menus_set_sensitive ("<Image>/Image/Histogram", lp);
   menus_set_sensitive ("<Image>/Filters", lp);

app/gdisplay.c

@@ -1014,8 +1014,7 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
   menus_set_sensitive ("<Image>/Edit/Stroke", lp);
   menus_set_sensitive ("<Image>/Edit/Cut Named", lp);
   menus_set_sensitive ("<Image>/Edit/Copy Named", lp);
-  menus_set_sensitive ("<Image>/Image/Map", lp);
-  menus_set_sensitive ("<Image>/Image/Adjust", lp);
+  menus_set_sensitive ("<Image>/Image/Colors", lp);
   menus_set_sensitive ("<Image>/Image/Channel Ops/Offset", lp);
   menus_set_sensitive ("<Image>/Image/Histogram", lp);
   menus_set_sensitive ("<Image>/Filters", lp);

app/gui/menus.c

@@ -59,11 +59,9 @@ static GtkMenuEntry menu_items[] =
   { "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL },
   { "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL },
   
-  {"<Toolbox>/File/<separator>",NULL,NULL,NULL},
+  { "<Toolbox>/File/<separator>",NULL,NULL,NULL},
 
-
-
- { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
+  { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
 
   { "<Image>/File/New", "<control>N", file_new_cmd_callback, (gpointer) 1 },
   { "<Image>/File/Open", "<control>O", file_open_cmd_callback, NULL },
@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/File/<separator>", NULL, NULL, NULL },
 
 
-
-
-
   { "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL },
   { "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
+  { "<Image>/File/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL },
   { "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL },
@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL },
   { "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL },
   { "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL },
+  { "<Image>/Edit/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL },
   { "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL },
@@ -124,18 +121,19 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/View/<separator>", NULL, NULL, NULL },
   { "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL },
   { "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL },
-
-  { "<Image>/Image/Map/Equalize", NULL, image_equalize_cmd_callback, NULL },
-  { "<Image>/Image/Map/Invert", NULL, image_invert_cmd_callback, NULL },
-  { "<Image>/Image/Map/Posterize", NULL, image_posterize_cmd_callback, NULL },
-  { "<Image>/Image/Map/Threshold", NULL, image_threshold_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Curves", NULL, image_curves_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Levels", NULL, image_levels_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/<separator>", NULL, NULL, NULL },
-  { "<Image>/Image/Adjust/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
+  
+  { "<Image>/Image/Colors/Equalize", NULL, image_equalize_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Invert", NULL, image_invert_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Posterize", NULL, image_posterize_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Threshold", NULL, image_threshold_cmd_callback, NULL },
+  { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
+  { "<Image>/Image/Colors/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Curves", NULL, image_curves_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Levels", NULL, image_levels_cmd_callback, NULL },
+  { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
+  { "<Image>/Image/Colors/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
   { "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL },
   { "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL },
   { "<Image>/Image/<separator>", NULL, NULL, NULL },
@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL },
   { "<Image>/Image/<separator>", NULL, NULL, NULL },
   { "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL },
+  { "<Image>/Image/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL },
   { "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL },

app/menus.c

@@ -59,11 +59,9 @@ static GtkMenuEntry menu_items[] =
   { "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL },
   { "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL },
   
-  {"<Toolbox>/File/<separator>",NULL,NULL,NULL},
+  { "<Toolbox>/File/<separator>",NULL,NULL,NULL},
 
-
-
- { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
+  { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
 
   { "<Image>/File/New", "<control>N", file_new_cmd_callback, (gpointer) 1 },
   { "<Image>/File/Open", "<control>O", file_open_cmd_callback, NULL },
@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/File/<separator>", NULL, NULL, NULL },
 
 
-
-
-
   { "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL },
   { "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
+  { "<Image>/File/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL },
   { "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL },
@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL },
   { "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL },
   { "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL },
+  { "<Image>/Edit/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL },
   { "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL },
@@ -124,18 +121,19 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/View/<separator>", NULL, NULL, NULL },
   { "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL },
   { "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL },
-
-  { "<Image>/Image/Map/Equalize", NULL, image_equalize_cmd_callback, NULL },
-  { "<Image>/Image/Map/Invert", NULL, image_invert_cmd_callback, NULL },
-  { "<Image>/Image/Map/Posterize", NULL, image_posterize_cmd_callback, NULL },
-  { "<Image>/Image/Map/Threshold", NULL, image_threshold_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Curves", NULL, image_curves_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Levels", NULL, image_levels_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/<separator>", NULL, NULL, NULL },
-  { "<Image>/Image/Adjust/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
+  
+  { "<Image>/Image/Colors/Equalize", NULL, image_equalize_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Invert", NULL, image_invert_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Posterize", NULL, image_posterize_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Threshold", NULL, image_threshold_cmd_callback, NULL },
+  { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
+  { "<Image>/Image/Colors/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Curves", NULL, image_curves_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Levels", NULL, image_levels_cmd_callback, NULL },
+  { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
+  { "<Image>/Image/Colors/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
   { "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL },
   { "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL },
   { "<Image>/Image/<separator>", NULL, NULL, NULL },
@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL },
   { "<Image>/Image/<separator>", NULL, NULL, NULL },
   { "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL },
+  { "<Image>/Image/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL },
   { "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL },

app/menus/menus.c

@@ -59,11 +59,9 @@ static GtkMenuEntry menu_items[] =
   { "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL },
   { "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL },
   
-  {"<Toolbox>/File/<separator>",NULL,NULL,NULL},
+  { "<Toolbox>/File/<separator>",NULL,NULL,NULL},
 
-
-
- { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
+  { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
 
   { "<Image>/File/New", "<control>N", file_new_cmd_callback, (gpointer) 1 },
   { "<Image>/File/Open", "<control>O", file_open_cmd_callback, NULL },
@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/File/<separator>", NULL, NULL, NULL },
 
 
-
-
-
   { "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL },
   { "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
+  { "<Image>/File/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL },
   { "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL },
@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL },
   { "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL },
   { "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL },
+  { "<Image>/Edit/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL },
   { "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL },
@@ -124,18 +121,19 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/View/<separator>", NULL, NULL, NULL },
   { "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL },
   { "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL },
-
-  { "<Image>/Image/Map/Equalize", NULL, image_equalize_cmd_callback, NULL },
-  { "<Image>/Image/Map/Invert", NULL, image_invert_cmd_callback, NULL },
-  { "<Image>/Image/Map/Posterize", NULL, image_posterize_cmd_callback, NULL },
-  { "<Image>/Image/Map/Threshold", NULL, image_threshold_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Curves", NULL, image_curves_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Levels", NULL, image_levels_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/<separator>", NULL, NULL, NULL },
-  { "<Image>/Image/Adjust/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
+  
+  { "<Image>/Image/Colors/Equalize", NULL, image_equalize_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Invert", NULL, image_invert_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Posterize", NULL, image_posterize_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Threshold", NULL, image_threshold_cmd_callback, NULL },
+  { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
+  { "<Image>/Image/Colors/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Curves", NULL, image_curves_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Levels", NULL, image_levels_cmd_callback, NULL },
+  { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
+  { "<Image>/Image/Colors/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
   { "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL },
   { "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL },
   { "<Image>/Image/<separator>", NULL, NULL, NULL },
@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL },
   { "<Image>/Image/<separator>", NULL, NULL, NULL },
   { "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL },
+  { "<Image>/Image/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL },
   { "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL },

app/widgets/gimpitemfactory.c

@@ -59,11 +59,9 @@ static GtkMenuEntry menu_items[] =
   { "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL },
   { "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL },
   
-  {"<Toolbox>/File/<separator>",NULL,NULL,NULL},
+  { "<Toolbox>/File/<separator>",NULL,NULL,NULL},
 
-
-
- { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
+  { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
 
   { "<Image>/File/New", "<control>N", file_new_cmd_callback, (gpointer) 1 },
   { "<Image>/File/Open", "<control>O", file_open_cmd_callback, NULL },
@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/File/<separator>", NULL, NULL, NULL },
 
 
-
-
-
   { "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL },
   { "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
+  { "<Image>/File/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL },
   { "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL },
@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL },
   { "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL },
   { "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL },
+  { "<Image>/Edit/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL },
   { "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL },
@@ -124,18 +121,19 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/View/<separator>", NULL, NULL, NULL },
   { "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL },
   { "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL },
-
-  { "<Image>/Image/Map/Equalize", NULL, image_equalize_cmd_callback, NULL },
-  { "<Image>/Image/Map/Invert", NULL, image_invert_cmd_callback, NULL },
-  { "<Image>/Image/Map/Posterize", NULL, image_posterize_cmd_callback, NULL },
-  { "<Image>/Image/Map/Threshold", NULL, image_threshold_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Curves", NULL, image_curves_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/Levels", NULL, image_levels_cmd_callback, NULL },
-  { "<Image>/Image/Adjust/<separator>", NULL, NULL, NULL },
-  { "<Image>/Image/Adjust/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
+  
+  { "<Image>/Image/Colors/Equalize", NULL, image_equalize_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Invert", NULL, image_invert_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Posterize", NULL, image_posterize_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Threshold", NULL, image_threshold_cmd_callback, NULL },
+  { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
+  { "<Image>/Image/Colors/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Curves", NULL, image_curves_cmd_callback, NULL },
+  { "<Image>/Image/Colors/Levels", NULL, image_levels_cmd_callback, NULL },
+  { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
+  { "<Image>/Image/Colors/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
   { "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL },
   { "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL },
   { "<Image>/Image/<separator>", NULL, NULL, NULL },
@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] =
   { "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL },
   { "<Image>/Image/<separator>", NULL, NULL, NULL },
   { "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL },
+  { "<Image>/Image/<separator>", NULL, NULL, NULL },
 
   { "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL },
   { "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL },

configure.in

@@ -68,7 +68,7 @@ AC_DEFUN(AC_GIMP_CHECK,
  	LDFLAGS="$saved_ldflags $X_LDFLAGS $X_LIBS"
 
 	dnl Dont cache this as it depends on CFLAGS, LDFLAGS, etc
-	AC_MSG_CHECKING([for glib and gtk >= 0.99.3])
+	AC_MSG_CHECKING([for gtk >= 0.99.3])
         AC_TRY_COMPILE(
 [#include <gtk/gtk.h>],
 [GtkArgSetFunc arg_set_func;],

plug-ins/AlienMap/AlienMap.c

@@ -187,7 +187,7 @@ query ()
         		  "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
         		  "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
         		  "1th May 1997",
-        		  "<Image>/Filters/Image/Alien-Map",
+        		  "<Image>/Filters/Colors/Alien Map",
         		  "RGB*",
         		  PROC_PLUG_IN,
         		  nargs, nreturn_vals,

plug-ins/Anamorphose/Anamorphose.c

@@ -119,7 +119,7 @@ query(void)
 			 "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
 			 "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
 			 "October, 1997",
-			 "<Image>/Filters/Distorts/Conical Anamorphose",
+			 "<Image>/Filters/Glass Effects/Conical Anamorphose",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,

plug-ins/CentralReflection/CentralReflection.c

@@ -114,7 +114,7 @@ query(void)
 			 "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
 			 "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
 			 "October, 1997",
-			 "<Image>/Filters/Distorts/Central-Reflection",
+			 "<Image>/Filters/Glass Effects/Central Reflection",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,

plug-ins/Curtain/Curtain.c

@@ -107,7 +107,7 @@ query(void)
 			 "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
 			 "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
 			 "October, 1997",
-			 "<Image>/Filters/Image/Curtain",
+			 "<Image>/Filters/Distorts/Curtain",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,

plug-ins/DigitalSignature/DigitalSignature.c

@@ -122,7 +122,7 @@ query(void)
 			 "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
 			 "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
 			 "December, 1997",
-			 "<Image>/Filters/Image/Digital Signature",
+			 "<Image>/Filters/Crypt/Digital Signature",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,

plug-ins/Encrypt_Decrypt/Encrypt_Decrypt.c

@@ -161,7 +161,7 @@ query(void)
 			 "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
 			 "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
 			 "October, 1997",
-			 "<Image>/Filters/Image/Encrypt & Decrypt",
+			 "<Image>/Filters/Crypt/Encrypt and Decrypt",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,

plug-ins/MapObject/mapobject_main.c

@@ -134,7 +134,7 @@ static void query(void)
 			  "Tom Bech & Federico Mena Quintero",
 			  "Tom Bech & Federico Mena Quintero",
 			  "Version 0.31, October 6 1997",
-			  "<Image>/Filters/Distorts/Map Object",
+			  "<Image>/Filters/Map/Map Object",
 			  "RGB*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/apply_lens/apply_lens.c

@@ -128,7 +128,7 @@ query(void)
 			 "Morten Eriksen",
 			 "Morten Eriksen",
 			 "1997",
-			 "<Image>/Filters/Distorts/Apply lens",
+			 "<Image>/Filters/Glass Effects/Apply Lens",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,

plug-ins/autocrop/autocrop.c

@@ -55,7 +55,7 @@ static void query()
 			       "Tim Newsome",
 			       "Tim Newsome",
 			       "1997",
-			       "<Image>/Filters/Transforms/Autocrop",
+			       "<Image>/Image/Transforms/Autocrop",
 			       "RGB*, GRAY*, INDEXED*",
 			       PROC_PLUG_IN,
 			       nargs, nreturn_vals,

plug-ins/autostretch_hsv/autostretch_hsv.c

@@ -79,7 +79,7 @@ query ()
 			  "Scott Goehring and Federico Mena Quintero",
 			  "Scott Goehring and Federico Mena Quintero",
 			  "1997",
-			  "<Image>/Filters/Image/Auto-Stretch HSV",
+			  "<Image>/Image/Colors/Auto-Stretch HSV",
 			  "RGB*, INDEXED*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/bumpmap/bumpmap.c

@@ -339,7 +339,7 @@ query(void)
 			       "Federico Mena Quintero and Jens Lautenbacher",
 			       "Federico Mena Quintero and Jens Lautenbacher",
 			       PLUG_IN_VERSION,
-			       "<Image>/Filters/Effects/Bump map",
+			       "<Image>/Filters/Map/Bump Map",
 			       "RGB*, GRAY*",
 			       PROC_PLUG_IN,
 			       nargs,

plug-ins/c_astretch/c_astretch.c

@@ -75,7 +75,7 @@ query ()
 			  "Federico Mena Quintero",
 			  "Federico Mena Quintero",
 			  "1996",
-			  "<Image>/Filters/Image/Contrast Auto-Stretch",
+			  "<Image>/Image/Colors/Auto-Stretch Contrast",
 			  "RGB*, GRAY*, INDEXED*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/colorify/colorify.c

@@ -113,11 +113,11 @@ query ()
 	static int        nargs        = sizeof(args) / sizeof(args[0]),
 		          nreturn_vals = 0;
 
-	gimp_install_procedure ("Colorify",
+	gimp_install_procedure ("plug_in_colorify",
 				"Similar to the \"Color\" mode for layers.",
 				"Makes an average of the RGB channels and uses it to set the color",
 				"Francisco Bustamante", "Francisco Bustamante",
-				"0.0.1", "<Image>/Filters/Image/Colorify", "RGB",
+				"0.0.1", "<Image>/Filters/Colors/Colorify", "RGB",
 				PROC_PLUG_IN,
 				nargs, nreturn_vals,
 				args, return_vals);

plug-ins/common/apply_lens.c

@@ -128,7 +128,7 @@ query(void)
 			 "Morten Eriksen",
 			 "Morten Eriksen",
 			 "1997",
-			 "<Image>/Filters/Distorts/Apply lens",
+			 "<Image>/Filters/Glass Effects/Apply Lens",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,

plug-ins/common/autocrop.c

@@ -55,7 +55,7 @@ static void query()
 			       "Tim Newsome",
 			       "Tim Newsome",
 			       "1997",
-			       "<Image>/Filters/Transforms/Autocrop",
+			       "<Image>/Image/Transforms/Autocrop",
 			       "RGB*, GRAY*, INDEXED*",
 			       PROC_PLUG_IN,
 			       nargs, nreturn_vals,

plug-ins/common/autostretch_hsv.c

@@ -79,7 +79,7 @@ query ()
 			  "Scott Goehring and Federico Mena Quintero",
 			  "Scott Goehring and Federico Mena Quintero",
 			  "1997",
-			  "<Image>/Filters/Image/Auto-Stretch HSV",
+			  "<Image>/Image/Colors/Auto-Stretch HSV",
 			  "RGB*, INDEXED*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/bumpmap.c

@@ -339,7 +339,7 @@ query(void)
 			       "Federico Mena Quintero and Jens Lautenbacher",
 			       "Federico Mena Quintero and Jens Lautenbacher",
 			       PLUG_IN_VERSION,
-			       "<Image>/Filters/Effects/Bump map",
+			       "<Image>/Filters/Map/Bump Map",
 			       "RGB*, GRAY*",
 			       PROC_PLUG_IN,
 			       nargs,

plug-ins/common/c_astretch.c

@@ -75,7 +75,7 @@ query ()
 			  "Federico Mena Quintero",
 			  "Federico Mena Quintero",
 			  "1996",
-			  "<Image>/Filters/Image/Contrast Auto-Stretch",
+			  "<Image>/Image/Colors/Auto-Stretch Contrast",
 			  "RGB*, GRAY*, INDEXED*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/colorify.c

@@ -113,11 +113,11 @@ query ()
 	static int        nargs        = sizeof(args) / sizeof(args[0]),
 		          nreturn_vals = 0;
 
-	gimp_install_procedure ("Colorify",
+	gimp_install_procedure ("plug_in_colorify",
 				"Similar to the \"Color\" mode for layers.",
 				"Makes an average of the RGB channels and uses it to set the color",
 				"Francisco Bustamante", "Francisco Bustamante",
-				"0.0.1", "<Image>/Filters/Image/Colorify", "RGB",
+				"0.0.1", "<Image>/Filters/Colors/Colorify", "RGB",
 				PROC_PLUG_IN,
 				nargs, nreturn_vals,
 				args, return_vals);

plug-ins/common/convmatrix.c

@@ -169,7 +169,7 @@ static void query()
 			       "Lauri Alanko",
 			       "Lauri Alanko",
 			       "1997",
-			       "<Image>/Filters/Image/Convolution Matrix",
+			       "<Image>/Filters/Generic/Convolution Matrix",
 			       "RGB*, GRAY*",
 			       PROC_PLUG_IN,
 			       nargs, nreturn_vals,

plug-ins/common/deinterlace.c

@@ -75,7 +75,7 @@ query ()
 			  "Andrew Kieschnick",
 			  "Andrew Kieschnick",
 			  "1997",
-			  "<Image>/Filters/Image/Deinterlace",
+			  "<Image>/Filters/Enhance/Deinterlace",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/depthmerge.c

@@ -195,7 +195,7 @@ static void query() {
     "Sean Cier",
     "Sean Cier",
     PLUG_IN_VERSION,
-    "<Image>/Filters/Effects/Depth merge",
+    "<Image>/Filters/Combine/Depth Merge",
     "RGB*, GRAY*",
     PROC_PLUG_IN,
     numArgs,

plug-ins/common/despeckle.c

@@ -44,6 +44,11 @@
  * Revision History:
  *
  *   $Log$
+ *   Revision 1.4  1998/01/25 02:18:21  yosh
+ *   Applied Sven's menu patch
+ *
+ *   -Yosh
+ *
  *   Revision 1.3  1998/01/04 19:20:55  scott
  *   * plug-ins/despeckle/despeckle.c: realloc buffers when the radius
  *   of effect changes; save all values (not just radius) in plugin
@@ -248,7 +253,7 @@ query(void)
       "Michael Sweet <mike@easysw.com>",
       "Michael Sweet <mike@easysw.com>",
       PLUG_IN_VERSION,
-      "<Image>/Filters/Image/Despeckle...", "RGB*, GRAY*",
+      "<Image>/Filters/Enhance/Despeckle...", "RGB*, GRAY*",
       PROC_PLUG_IN, nargs, nreturn_vals, args, return_vals);
 }
 

plug-ins/common/destripe.c

@@ -157,7 +157,7 @@ query(void)
       "This plug-in selectively performs a median or adaptive box filter on an image.",
       "Marc Lehmann", "Marc Lehmann",
       PLUG_IN_VERSION,
-      "<Image>/Filters/Image/Destripe...",
+      "<Image>/Filters/Enhance/Destripe...",
       "RGB*, GRAY*",
       PROC_PLUG_IN, nargs, nreturn_vals, args, return_vals);
 }

plug-ins/common/diffraction.c

@@ -172,8 +172,7 @@ query(void)
 			       "Federico Mena Quintero",
 			       "Federico Mena Quintero & David Bleecker",
 			       "April 1997, 0.5",
-			       "<Image>/Filters/Textures/Diffraction patterns",
-			       /* "<Image>/Diffraction patterns", */
+			       "<Image>/Filters/Render/Diffraction Patterns",
 			       "RGB*",
 			       PROC_PLUG_IN,
 			       nargs,

plug-ins/common/displace.c

@@ -187,7 +187,7 @@ query ()
 			  "Stephen Robert Norris & (ported to 1.0 by) Spencer Kimball",
 			  "Stephen Robert Norris",
 			  "1996",
-			  "<Image>/Filters/Distorts/Displace",
+			  "<Image>/Filters/Map/Displace",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/engrave.c

@@ -118,7 +118,7 @@ query()
     "Spencer Kimball & Peter Mattis, Eiichi Takamori, Torsten Martinsen",
     "Spencer Kimball & Peter Mattis, Eiichi Takamori, Torsten Martinsen",
 			   "1995,1996,1997",
-			   "<Image>/Filters/Image/Engrave",
+			   "<Image>/Filters/Distorts/Engrave",
 			   "RGB, GRAY",
 			   PROC_PLUG_IN,
 			   nargs, nreturn_vals,

plug-ins/common/exchange.c

@@ -103,7 +103,7 @@ void	query()
 			       "robert@experimental.net",
 			       "robert@experimental.net",
 			       "June 17th, 1997",
-			       "<Image>/Filters/Image/Color exchange",
+			       "<Image>/Filters/Colors/Color Exchange",
 			       "RGB*",
 			       PROC_PLUG_IN,
 			       nargs, nreturn_vals,

plug-ins/common/film.c

@@ -239,7 +239,7 @@ query ()
 			  "Peter Kirchgessner",
 			  "Peter Kirchgessner (pkirchg@aol.com)",
 			  "1997",
-			  "<Image>/Filters/Darkroom/Film",
+			  "<Image>/Filters/Combine/Film",
 			  "INDEXED*, GRAY*, RGB*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/flarefx.c

@@ -141,7 +141,7 @@ static void query ()
 			  "Karl-Johan Andersson", /* Author */
 			  "Karl-Johan Andersson", /* Copyright */
 			  "1998",
-			  "<Image>/Filters/Effects/FlareFX",
+			  "<Image>/Filters/Light Effects/FlareFX",
 			  "RGB*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/fp.c

@@ -65,7 +65,7 @@ query ()
 			  "Pavel Grinfeld (pavel@ml.com)",
 			  "Pavel Grinfeld (pavel@ml.com)",
 			  "27th March 1997",
-			  "<Image>/Filters/Darkroom/Filter Pack",
+			  "<Image>/Filters/Colors/Filter Pack",
 			  "RGB*,INDEXED*,GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/fractaltrace.c

@@ -24,7 +24,7 @@
 #define PLUG_IN_NAME     "plug_in_fractal_trace"
 #define PLUG_IN_TITLE    "Fractal Trace"
 #define PLUG_IN_VERSION  "v0.4 test version (Dec. 25 1997)"
-#define PLUG_IN_CATEGORY "<Image>/Filters/Distorts/Fractal Trace"
+#define PLUG_IN_CATEGORY "<Image>/Filters/Map/Fractal Trace"
 
 /******************************************************************************/
 

plug-ins/common/glasstile.c

@@ -100,7 +100,7 @@ static void query ()
 			  "Karl-Johan Andersson", /* Author */
 			  "Karl-Johan Andersson", /* Copyright */
 			  "1997",
-			  "<Image>/Filters/Distorts/Glass Tile",
+			  "<Image>/Filters/Glass Effects/Glass Tile",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/gradmap.c

@@ -111,7 +111,7 @@ query()
 			  "Eiichi Takamori",
 			  "Eiichi Takamori",
 			  "1997",
-			  "<Image>/Filters/Image/Gradient Map",
+			  "<Image>/Filters/Colors/Gradient Map",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/hot.c

@@ -211,7 +211,7 @@ query(void){
                          "Eric L. Hernes, Alan Wm Paeth",
                          "Eric L. Hernes",
                          "1997",
-                         "<Image>/Filters/Image/Hot",
+                         "<Image>/Filters/Colors/Hot",
                          "RGB",
                          PROC_PLUG_IN,
                          nargs, nrets,

plug-ins/common/illusion.c

@@ -102,7 +102,7 @@ static void query( void )
 			 "Hirotsuna Mizuno <s1041150@u-aizu.ac.jp>",
 			 "Hirotsuna Mizuno",
 			 PLUG_IN_VERSION,
-			 "<Image>/Filters/Effects/Illusion",
+			 "<Image>/Filters/Map/Illusion",
 			 "RGB*, GRAY*",
 			 PROC_PLUG_IN,
 			 nargs,

plug-ins/common/max_rgb.c

@@ -31,7 +31,7 @@
 #define	PLUG_IN_NAME	"plug_in_max_rgb"
 #define SHORT_NAME	"max_rgb"
 #define PROGRESS_NAME	"max_rgb: scanning..."
-#define MENU_POSITION	"<Image>/Filters/Image/Max RGB"
+#define MENU_POSITION	"<Image>/Filters/Colors/Max RGB"
 #define	MAIN_FUNCTION	max_rgb
 /* you need not change the following names */
 #define INTERFACE	max_rgb_interface

plug-ins/common/nlfilt.c

@@ -118,7 +118,7 @@ query(void){
                          "Graeme W. Gill, gimp 0.99 plugin by Eric L. Hernes",
                          "Graeme W. Gill, Eric L. Hernes",
                          "1997",
-                         "<Image>/Filters/Image/NL Filter",
+                         "<Image>/Filters/Enhance/NL Filter",
                          "RGB,GRAY",
                          PROC_PLUG_IN,
                          nargs, nrets,

plug-ins/common/noisify.c

@@ -124,7 +124,7 @@ query ()
 			  "Torsten Martinsen",
 			  "Torsten Martinsen",
 			  "1996",
-			  "<Image>/Filters/Distorts/Noisify",
+			  "<Image>/Filters/Noise/Noisify",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/normalize.c

@@ -74,7 +74,7 @@ query ()
 			  "Adam D. Moss, Federico Mena Quintero",
 			  "Adam D. Moss, Federico Mena Quintero",
 			  "1997",
-			  "<Image>/Filters/Image/Normalize",
+			  "<Image>/Image/Colors/Normalize",
 			  "RGB*, GRAY*, INDEXED*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/nova.c

@@ -214,7 +214,7 @@ query()
 			  "Eiichi Takamori",
 			  "Eiichi Takamori",
 			  "1997",
-			  "<Image>/Filters/Effects/SuperNova",
+			  "<Image>/Filters/Light Effects/SuperNova",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/papertile.c

@@ -105,7 +105,7 @@ static void query( void )
 			 "Hirotsuna Mizuno <s1041150@u-aizu.ac.jp>",
 			 "Hirotsuna Mizuno",
 			 PLUG_IN_VERSION,
-			 "<Image>/Filters/Effects/Paper Tile",
+			 "<Image>/Filters/Map/Paper Tile",
 			 "RGB*, GRAY*",
 			 PROC_PLUG_IN,
 			 nargs,

plug-ins/common/pixelize.c

@@ -178,7 +178,7 @@ query()
 			  "Spencer Kimball & Peter Mattis, Tracy Scott, (ported to 1.0 by) Eiichi Takamori",
 			  "Spencer Kimball & Peter Mattis, Tracy Scott",
 			  "1995",
-			  "<Image>/Filters/Image/Pixelize",
+			  "<Image>/Filters/Blur/Pixelize",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/randomize.c

@@ -293,7 +293,7 @@ query()
 	(char *) author,
 	(char *) copyrights,
 	(char *) copyright_date,
-	"<Image>/Filters/Distorts/Randomize",
+	"<Image>/Filters/Noise/Randomize",
 	"RGB*, GRAY*, INDEXED*",
 	PROC_PLUG_IN,
 	nargs, nreturn_vals,

plug-ins/common/rotate.c

@@ -1,6 +1,6 @@
 /*  
- *  Rotate plug-in v0.5 by Sven Neumann, neumanns@uni-duesseldorf.de  
- *  1998/01/09
+ *  Rotate plug-in v0.6 by Sven Neumann, neumanns@uni-duesseldorf.de  
+ *  1998/01/15
  *
  *  Any suggestions, bug-reports or patches are very welcome.
  * 
@@ -38,7 +38,8 @@
  *  (10/13/97)  v0.3a  small bugfix, no real changes
  *  (10/17/97)  v0.4   now handles selections
  *  (01/09/98)  v0.5   a few fixes to support portability
- *                  
+ *  (01/15/98)  v0.6   fixed a line that caused rotate to crash on some 
+ *                     systems                
  */
 
 /* TODO List
@@ -55,8 +56,8 @@
 /* Defines */
 #define PLUG_IN_NAME        "plug_in_rotate"
 #define PLUG_IN_PRINT_NAME  "Rotate"
-#define PLUG_IN_VERSION     "v0.5 (01/09/98)"
-#define PLUG_IN_MENU_PATH   "<Image>/Filters/Transforms/Rotate"
+#define PLUG_IN_VERSION     "v0.6 (01/15/98)"
+#define PLUG_IN_MENU_PATH   "<Image>/Image/Transforms/Rotate"
 #define PLUG_IN_IMAGE_TYPES "RGB*, INDEXED*, GRAY*"
 #define PLUG_IN_AUTHOR      "Sven Neumann (neumanns@uni-duesseldorf.de)"
 #define PLUG_IN_COPYRIGHT   "Sven Neumann"
@@ -586,7 +587,6 @@ rotate_dialog (void)
   gtk_rc_parse (gimp_gtkrc ());
 
   gdk_set_use_xshm (gimp_use_xshm ());
-  gtk_widget_set_default_visual (gtk_preview_get_visual ());
 
   /* Main Dialog */
   dialog = gtk_dialog_new ();

plug-ins/common/rotators.c

@@ -64,7 +64,7 @@ static void query()
 			 "Adam D. Moss (adam@gimp.org)",
 			 "Adam D. Moss (adam@gimp.org)",
 			 "1997",
-			 "<Image>/Filters/Transforms/Layer/Rotate 90",
+			 "<Image>/Image/Transforms/Layer/Rotate 90",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,
@@ -76,7 +76,7 @@ static void query()
 			 "Adam D. Moss (adam@gimp.org)",
 			 "Adam D. Moss (adam@gimp.org)",
 			 "1997",
-			 "<Image>/Filters/Transforms/Layer/Rotate 270",
+			 "<Image>/Image/Transforms/Layer/Rotate 270",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,
@@ -88,7 +88,7 @@ static void query()
 			 "Adam D. Moss (adam@gimp.org)",
 			 "Adam D. Moss (adam@gimp.org)",
 			 "1997",
-			 "<Image>/Filters/Transforms/Image/Rotate 90",
+			 "<Image>/Image/Transforms/Image/Rotate 90",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,
@@ -100,7 +100,7 @@ static void query()
 			 "Adam D. Moss (adam@gimp.org)",
 			 "Adam D. Moss (adam@gimp.org)",
 			 "1997",
-			 "<Image>/Filters/Transforms/Image/Rotate 270",
+			 "<Image>/Image/Transforms/Image/Rotate 270",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,

plug-ins/common/scatter_hsv.c

@@ -31,7 +31,7 @@
 #define	PLUG_IN_NAME	"plug_in_scatter_hsv"
 #define SHORT_NAME	"scatter_hsv"
 #define PROGRESS_NAME	"scatter_hsv: scattering..."
-#define MENU_POSITION	"<Image>/Filters/Image/Scatter HSV"
+#define MENU_POSITION	"<Image>/Filters/Colors/Scatter HSV"
 #define	MAIN_FUNCTION	scatter_hsv
 #define INTERFACE	scatter_hsv_interface
 #define	DIALOG		scatter_hsv_dialog

plug-ins/common/sharpen.c

@@ -40,6 +40,11 @@
  * Revision History:
  *
  *   $Log$
+ *   Revision 1.2  1998/01/25 02:18:43  yosh
+ *   Applied Sven's menu patch
+ *
+ *   -Yosh
+ *
  *   Revision 1.1.1.1  1997/11/24 22:04:37  sopwith
  *   Let's try this import one last time.
  *
@@ -195,7 +200,7 @@ query(void)
       "Michael Sweet <mike@easysw.com>",
       "Michael Sweet <mike@easysw.com>",
       PLUG_IN_VERSION,
-      "<Image>/Filters/Image/Sharpen...", "RGB*, GRAY*",
+      "<Image>/Filters/Enhance/Sharpen...", "RGB*, GRAY*",
       PROC_PLUG_IN, nargs, nreturn_vals, args, return_vals);
 }
 

plug-ins/common/smooth_palette.c

@@ -72,7 +72,7 @@ static void query()
 			 "Scott Draves",
 			 "Scott Draves",
 			 "1997",
-			 "<Image>/Filters/Transforms/SmoothPalette",
+			 "<Image>/Filters/Colors/SmoothPalette",
 			 "RGB*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,

plug-ins/common/sparkle.c

@@ -164,7 +164,7 @@ query ()
 			  "John Beale, & (ported to GIMP v0.54) Michael J. Hammel & (ported to GIMP v1.0) Spencer Kimball",
 			  "John Beale",
 			  "1996",
-			  "<Image>/Filters/Artistic/Sparkle",
+			  "<Image>/Filters/Light Effects/Sparkle",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/spread.c

@@ -124,7 +124,7 @@ query ()
 			  "Spencer Kimball and Peter Mattis, ported by Brian Degenhardt and Federico Mena Quintero",
 			  "Federico Mena Quintero and Brian Degenhardt",
 			  "1997",
-			  "<Image>/Filters/Distorts/Spread",
+			  "<Image>/Filters/Noise/Spread",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/threshold_alpha.c

@@ -31,7 +31,7 @@
 #define	PLUG_IN_NAME	"plug_in_threshold_alpha"
 #define SHORT_NAME	"threshold_alpha"
 #define PROGRESS_NAME	"threshold_alpha (0.13):coloring transparency..."
-#define MENU_POSITION	"<Image>/Filters/Image/Threshold alpha"
+#define MENU_POSITION	"<Image>/Image/Alpha/Threshold Alpha"
 #define	MAIN_FUNCTION	threshold_alpha
 /* you need not change the following names */
 #define INTERFACE	threshold_alpha_interface

plug-ins/common/tile.c

@@ -124,7 +124,7 @@ query ()
 			  "Spencer Kimball & Peter Mattis",
 			  "Spencer Kimball & Peter Mattis",
 			  "1996-1997",
-			  "<Image>/Filters/Transforms/Tile",
+			  "<Image>/Filters/Map/Tile",
 			  "RGB*, GRAY*, INDEXED*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/tileit.c

@@ -211,13 +211,13 @@ query ()
   static int nargs = sizeof (args) / sizeof (args[0]);
   static int nreturn_vals = 0;
 
-  gimp_install_procedure ("plug_in_tileit",
+  gimp_install_procedure ("plug_in_small_tiles",
 			  "Tiles image into smaller versions of the orginal",
 			  "More here later",
 			  "Andy Thomas",
 			  "Andy Thomas",
 			  "1997",
-			  "<Image>/Filters/Transforms/TileIt",
+			  "<Image>/Filters/Map/Small Tiles",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/tiler.c

@@ -51,13 +51,13 @@ query ()
   static int nargs = sizeof (args) / sizeof (args[0]);
   static int nreturn_vals = 0;
 
-  gimp_install_procedure ("plug_in_tiler",
+  gimp_install_procedure ("plug_in_make_seamless",
 			  "Seamless tile creation",
 			  "This plugin creates a seamless tileable from the input image",
 			  "Tim Rowley",
 			  "Tim Rowley",
 			  "1997",
-			  "<Image>/Filters/Transforms/Tiler",
+			  "<Image>/Filters/Map/Make Seamless",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/video.c

@@ -1833,7 +1833,7 @@ query ()
 			  "Adam D. Moss (adam@foxbox.org)",
 			  "Adam D. Moss (adam@foxbox.org)",
 			  "2nd March 1997",
-			  "<Image>/Filters/Distorts/Video",
+			  "<Image>/Filters/Misc/Video",
 			  "RGB*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/vinvert.c

@@ -85,7 +85,7 @@ query ()
 			  "Adam D. Moss (adam@foxbox.org)",
 			  "Adam D. Moss (adam@foxbox.org)",
 			  "27th March 1997",
-			  "<Image>/Filters/Image/Value Invert",
+			  "<Image>/Filters/Colors/Value Invert",
 			  "RGB*, INDEXED*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/zealouscrop.c

@@ -65,7 +65,7 @@ static void query()
 			 "Adam D. Moss",
 			 "Adam D. Moss",
 			 "1997",
-			 "<Image>/Filters/Transforms/ZealousCrop(tm)",
+			 "<Image>/Image/Transforms/Zealous Crop",
 			 "RGB*, GRAY*, INDEXED*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,

plug-ins/convmatrix/convmatrix.c

@@ -169,7 +169,7 @@ static void query()
 			       "Lauri Alanko",
 			       "Lauri Alanko",
 			       "1997",
-			       "<Image>/Filters/Image/Convolution Matrix",
+			       "<Image>/Filters/Generic/Convolution Matrix",
 			       "RGB*, GRAY*",
 			       PROC_PLUG_IN,
 			       nargs, nreturn_vals,

plug-ins/coordmap/coordmap.c

@@ -172,7 +172,7 @@ static void query()
 			  "Michael Schubart",
 			  "Michael Schubart",
 			  "Sep 1 1997",
-			  "<Image>/Filters/Distorts/Coordinate Map",
+			  "<Image>/Filters/Map/Coordinate Map",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/deinterlace/deinterlace.c

@@ -75,7 +75,7 @@ query ()
 			  "Andrew Kieschnick",
 			  "Andrew Kieschnick",
 			  "1997",
-			  "<Image>/Filters/Image/Deinterlace",
+			  "<Image>/Filters/Enhance/Deinterlace",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/depthmerge/depthmerge.c

@@ -195,7 +195,7 @@ static void query() {
     "Sean Cier",
     "Sean Cier",
     PLUG_IN_VERSION,
-    "<Image>/Filters/Effects/Depth merge",
+    "<Image>/Filters/Combine/Depth Merge",
     "RGB*, GRAY*",
     PROC_PLUG_IN,
     numArgs,

plug-ins/despeckle/despeckle.c

@@ -44,6 +44,11 @@
  * Revision History:
  *
  *   $Log$
+ *   Revision 1.4  1998/01/25 02:18:21  yosh
+ *   Applied Sven's menu patch
+ *
+ *   -Yosh
+ *
  *   Revision 1.3  1998/01/04 19:20:55  scott
  *   * plug-ins/despeckle/despeckle.c: realloc buffers when the radius
  *   of effect changes; save all values (not just radius) in plugin
@@ -248,7 +253,7 @@ query(void)
       "Michael Sweet <mike@easysw.com>",
       "Michael Sweet <mike@easysw.com>",
       PLUG_IN_VERSION,
-      "<Image>/Filters/Image/Despeckle...", "RGB*, GRAY*",
+      "<Image>/Filters/Enhance/Despeckle...", "RGB*, GRAY*",
       PROC_PLUG_IN, nargs, nreturn_vals, args, return_vals);
 }
 

plug-ins/destripe/destripe.c

@@ -157,7 +157,7 @@ query(void)
       "This plug-in selectively performs a median or adaptive box filter on an image.",
       "Marc Lehmann", "Marc Lehmann",
       PLUG_IN_VERSION,
-      "<Image>/Filters/Image/Destripe...",
+      "<Image>/Filters/Enhance/Destripe...",
       "RGB*, GRAY*",
       PROC_PLUG_IN, nargs, nreturn_vals, args, return_vals);
 }

plug-ins/diffraction/diffraction.c

@@ -172,8 +172,7 @@ query(void)
 			       "Federico Mena Quintero",
 			       "Federico Mena Quintero & David Bleecker",
 			       "April 1997, 0.5",
-			       "<Image>/Filters/Textures/Diffraction patterns",
-			       /* "<Image>/Diffraction patterns", */
+			       "<Image>/Filters/Render/Diffraction Patterns",
 			       "RGB*",
 			       PROC_PLUG_IN,
 			       nargs,

plug-ins/displace/displace.c

@@ -187,7 +187,7 @@ query ()
 			  "Stephen Robert Norris & (ported to 1.0 by) Spencer Kimball",
 			  "Stephen Robert Norris",
 			  "1996",
-			  "<Image>/Filters/Distorts/Displace",
+			  "<Image>/Filters/Map/Displace",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/engrave/engrave.c

@@ -118,7 +118,7 @@ query()
     "Spencer Kimball & Peter Mattis, Eiichi Takamori, Torsten Martinsen",
     "Spencer Kimball & Peter Mattis, Eiichi Takamori, Torsten Martinsen",
 			   "1995,1996,1997",
-			   "<Image>/Filters/Image/Engrave",
+			   "<Image>/Filters/Distorts/Engrave",
 			   "RGB, GRAY",
 			   PROC_PLUG_IN,
 			   nargs, nreturn_vals,

plug-ins/exchange/exchange.c

@@ -103,7 +103,7 @@ void	query()
 			       "robert@experimental.net",
 			       "robert@experimental.net",
 			       "June 17th, 1997",
-			       "<Image>/Filters/Image/Color exchange",
+			       "<Image>/Filters/Colors/Color Exchange",
 			       "RGB*",
 			       PROC_PLUG_IN,
 			       nargs, nreturn_vals,

plug-ins/film/film.c

@@ -239,7 +239,7 @@ query ()
 			  "Peter Kirchgessner",
 			  "Peter Kirchgessner (pkirchg@aol.com)",
 			  "1997",
-			  "<Image>/Filters/Darkroom/Film",
+			  "<Image>/Filters/Combine/Film",
 			  "INDEXED*, GRAY*, RGB*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/flarefx/flarefx.c

@@ -141,7 +141,7 @@ static void query ()
 			  "Karl-Johan Andersson", /* Author */
 			  "Karl-Johan Andersson", /* Copyright */
 			  "1998",
-			  "<Image>/Filters/Effects/FlareFX",
+			  "<Image>/Filters/Light Effects/FlareFX",
 			  "RGB*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/fp/fp.c

@@ -65,7 +65,7 @@ query ()
 			  "Pavel Grinfeld (pavel@ml.com)",
 			  "Pavel Grinfeld (pavel@ml.com)",
 			  "27th March 1997",
-			  "<Image>/Filters/Darkroom/Filter Pack",
+			  "<Image>/Filters/Colors/Filter Pack",
 			  "RGB*,INDEXED*,GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/fractaltrace/fractaltrace.c

@@ -24,7 +24,7 @@
 #define PLUG_IN_NAME     "plug_in_fractal_trace"
 #define PLUG_IN_TITLE    "Fractal Trace"
 #define PLUG_IN_VERSION  "v0.4 test version (Dec. 25 1997)"
-#define PLUG_IN_CATEGORY "<Image>/Filters/Distorts/Fractal Trace"
+#define PLUG_IN_CATEGORY "<Image>/Filters/Map/Fractal Trace"
 
 /******************************************************************************/
 

plug-ins/fuse/fuse.c

@@ -130,7 +130,7 @@ static void query()
 			 "Scott Draves",
 			 "Scott Draves",
 			 "Nov 1997",
-			 "<Image>/Filters/Transforms/Fuse",
+			 "<Image>/Filters/Combine/Fuse",
 			 "RGB*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,

plug-ins/gag-0.3/gag-plugin.c

@@ -77,7 +77,7 @@ query (void)
 			  "Daniel Skarda",
 			  "Daniel Skarda",
 			  "1997",
-			  "<Image>/Filters/Artistic/GAG",
+			  "<Image>/Filters/Render/GAG",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  i_nargs,
@@ -91,7 +91,7 @@ query (void)
 			  "Daniel Skarda",
 			  "Daniel Skarda",
 			  "1997",
-			  "<Image>/Filters/Artistic/GAG",
+			  "<Image>/Filters/Render/GAG",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  r_nargs,

plug-ins/gflare/gflare.c

@@ -720,7 +720,7 @@ plugin_query()
 			  "Eiichi Takamori",
 			  "Eiichi Takamori, and a lot of GIMP people",
 			  "1997",
-			  "<Image>/Filters/Effects/GFlare",
+			  "<Image>/Filters/Light Effects/GFlare",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/glasstile/glasstile.c

@@ -100,7 +100,7 @@ static void query ()
 			  "Karl-Johan Andersson", /* Author */
 			  "Karl-Johan Andersson", /* Copyright */
 			  "1997",
-			  "<Image>/Filters/Distorts/Glass Tile",
+			  "<Image>/Filters/Glass Effects/Glass Tile",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/gradmap/gradmap.c

@@ -111,7 +111,7 @@ query()
 			  "Eiichi Takamori",
 			  "Eiichi Takamori",
 			  "1997",
-			  "<Image>/Filters/Image/Gradient Map",
+			  "<Image>/Filters/Colors/Gradient Map",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/holes/holes.c

@@ -122,7 +122,7 @@ static void query()
 				"Xavier Bouchoux",
 				"Xavier Bouchoux",
 				"1997",
-				"<Image>/Filters/Holes",
+				"<Image>/Image/Alpha/Holes",
 				"RGBA, GRAYA, INDEXEDA",
 				PROC_PLUG_IN,
 				nargs, nreturn_vals,

plug-ins/hot/hot.c

@@ -211,7 +211,7 @@ query(void){
                          "Eric L. Hernes, Alan Wm Paeth",
                          "Eric L. Hernes",
                          "1997",
-                         "<Image>/Filters/Image/Hot",
+                         "<Image>/Filters/Colors/Hot",
                          "RGB",
                          PROC_PLUG_IN,
                          nargs, nrets,

plug-ins/illusion/illusion.c

@@ -102,7 +102,7 @@ static void query( void )
 			 "Hirotsuna Mizuno <s1041150@u-aizu.ac.jp>",
 			 "Hirotsuna Mizuno",
 			 PLUG_IN_VERSION,
-			 "<Image>/Filters/Effects/Illusion",
+			 "<Image>/Filters/Map/Illusion",
 			 "RGB*, GRAY*",
 			 PROC_PLUG_IN,
 			 nargs,

plug-ins/magiceye/magiceye.c

@@ -79,7 +79,7 @@ query ()
 			  "Alexander Schulz",
 			  "Alexander Schulz",
 			  "1997",
-			  "<Image>/Filters/Render/Magic Eye",
+			  "<Image>/Filters/Misc/Magic Eye",
 			  "GRAY",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/mathmap/mathmap.c

@@ -249,7 +249,7 @@ query(void)
 			   "Mark Probst",
 			   "Mark Probst",
 			   "October 1997, 0.1",
-			   "<Image>/Filters/Distorts/MathMap",
+			   "<Image>/Filters/Generic/MathMap",
 			   "RGB",
 			   PROC_PLUG_IN,
 			   nargs,

plug-ins/max_rgb/max_rgb.c

@@ -31,7 +31,7 @@
 #define	PLUG_IN_NAME	"plug_in_max_rgb"
 #define SHORT_NAME	"max_rgb"
 #define PROGRESS_NAME	"max_rgb: scanning..."
-#define MENU_POSITION	"<Image>/Filters/Image/Max RGB"
+#define MENU_POSITION	"<Image>/Filters/Colors/Max RGB"
 #define	MAIN_FUNCTION	max_rgb
 /* you need not change the following names */
 #define INTERFACE	max_rgb_interface

plug-ins/nlfilt/nlfilt.c

@@ -118,7 +118,7 @@ query(void){
                          "Graeme W. Gill, gimp 0.99 plugin by Eric L. Hernes",
                          "Graeme W. Gill, Eric L. Hernes",
                          "1997",
-                         "<Image>/Filters/Image/NL Filter",
+                         "<Image>/Filters/Enhance/NL Filter",
                          "RGB,GRAY",
                          PROC_PLUG_IN,
                          nargs, nrets,

plug-ins/noisify/noisify.c

@@ -124,7 +124,7 @@ query ()
 			  "Torsten Martinsen",
 			  "Torsten Martinsen",
 			  "1996",
-			  "<Image>/Filters/Distorts/Noisify",
+			  "<Image>/Filters/Noise/Noisify",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/normalize/normalize.c

@@ -74,7 +74,7 @@ query ()
 			  "Adam D. Moss, Federico Mena Quintero",
 			  "Adam D. Moss, Federico Mena Quintero",
 			  "1997",
-			  "<Image>/Filters/Image/Normalize",
+			  "<Image>/Image/Colors/Normalize",
 			  "RGB*, GRAY*, INDEXED*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/nova/nova.c

@@ -214,7 +214,7 @@ query()
 			  "Eiichi Takamori",
 			  "Eiichi Takamori",
 			  "1997",
-			  "<Image>/Filters/Effects/SuperNova",
+			  "<Image>/Filters/Light Effects/SuperNova",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/papertile/papertile.c

@@ -105,7 +105,7 @@ static void query( void )
 			 "Hirotsuna Mizuno <s1041150@u-aizu.ac.jp>",
 			 "Hirotsuna Mizuno",
 			 PLUG_IN_VERSION,
-			 "<Image>/Filters/Effects/Paper Tile",
+			 "<Image>/Filters/Map/Paper Tile",
 			 "RGB*, GRAY*",
 			 PROC_PLUG_IN,
 			 nargs,

plug-ins/pixelize/pixelize.c

@@ -178,7 +178,7 @@ query()
 			  "Spencer Kimball & Peter Mattis, Tracy Scott, (ported to 1.0 by) Eiichi Takamori",
 			  "Spencer Kimball & Peter Mattis, Tracy Scott",
 			  "1995",
-			  "<Image>/Filters/Image/Pixelize",
+			  "<Image>/Filters/Blur/Pixelize",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/randomize/randomize.c

@@ -293,7 +293,7 @@ query()
 	(char *) author,
 	(char *) copyrights,
 	(char *) copyright_date,
-	"<Image>/Filters/Distorts/Randomize",
+	"<Image>/Filters/Noise/Randomize",
 	"RGB*, GRAY*, INDEXED*",
 	PROC_PLUG_IN,
 	nargs, nreturn_vals,

plug-ins/rcm/rcm.c

@@ -43,13 +43,13 @@ query ()
    int nargs = sizeof (args) / sizeof (args[0]);
    int nreturn_vals = 0;
 
-  gimp_install_procedure ("Colormap Rotation Plug-in",
+  gimp_install_procedure ("plug_in_colormap_rotation",
 			  "Does that xv rotation thingy",
 			  "Then something else here",
 			  "Pavel Grinfeld (pavel@ml.com)",
 			  "Pavel Grinfeld (pavel@ml.com)",
 			  "27th March 1997",
-			  "<Image>/Filters/Darkroom/Colormap Rotation",
+			  "<Image>/Filters/Colors/Colormap Rotation",
 			  "RGB*,INDEXED*,GRAY",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,