[gimp] Bug 700675 - Missing menu locations for registration and other menu...

[Michael Natterer <mitch src gnome org>]

commit 564e6010fdf2d68746a7551cbf1084b19ec0177e
Author: Michael Natterer <mitch gimp org>
Date:   Fri May 24 09:23:52 2013 +0200

    Bug 700675 - Missing menu locations for registration and other menu...
    
    Remove the legacy <Toolbox>, <Load> and <Save> from the error message
    that states which plug-in menu paths are valid, and add the missing
    <Fonts> and <ToolPresets>. Also actually handle <ToolPresets>, this
    was apparently forgotten.

 app/plug-in/gimppluginprocedure.c |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/app/plug-in/gimppluginprocedure.c b/app/plug-in/gimppluginprocedure.c
index 18da3cf..e28912f 100644
--- a/app/plug-in/gimppluginprocedure.c
+++ b/app/plug-in/gimppluginprocedure.c
@@ -449,12 +449,13 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure  *proc,
           goto failure;
         }
     }
-  else if (g_str_has_prefix (menu_path, "<Brushes>")   ||
-           g_str_has_prefix (menu_path, "<Dynamics>")  ||
-           g_str_has_prefix (menu_path, "<Gradients>") ||
-           g_str_has_prefix (menu_path, "<Palettes>")  ||
-           g_str_has_prefix (menu_path, "<Patterns>")  ||
-           g_str_has_prefix (menu_path, "<Fonts>")     ||
+  else if (g_str_has_prefix (menu_path, "<Brushes>")     ||
+           g_str_has_prefix (menu_path, "<Dynamics>")    ||
+           g_str_has_prefix (menu_path, "<Gradients>")   ||
+           g_str_has_prefix (menu_path, "<Palettes>")    ||
+           g_str_has_prefix (menu_path, "<Patterns>")    ||
+           g_str_has_prefix (menu_path, "<ToolPresets>") ||
+           g_str_has_prefix (menu_path, "<Fonts>")       ||
            g_str_has_prefix (menu_path, "<Buffers>"))
     {
       if ((procedure->num_args < 1) ||
@@ -472,11 +473,11 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure  *proc,
                    "Plug-In \"%s\"\n(%s)\n"
                    "attempted to install procedure \"%s\" "
                    "in the invalid menu location \"%s\".\n"
-                   "Use either \"<Toolbox>\", \"<Image>\", "
+                   "Use either \"<Image>\", "
                    "\"<Layers>\", \"<Channels>\", \"<Vectors>\", "
-                   "\"<Colormap>\", \"<Load>\", \"<Save>\", "
-                   "\"<Brushes>\", \"<Dynamics>\", \"<Gradients>\", "
-                   "\"<Palettes>\", \"<Patterns>\" or \"<Buffers>\".",
+                   "\"<Colormap>\", \"<Brushes>\", \"<Dynamics>\", "
+                   "\"<Gradients>\", \"<Palettes>\", \"<Patterns>\", "
+                   "\"<ToolPresets>\", \"<Fonts>\" or \"<Buffers>\".",
                    basename, gimp_filename_to_utf8 (proc->prog),
                    gimp_object_get_name (proc),
                    menu_path);