[gimp] app, menus, plug-ins: add new Submenu Image -> Color Management

[Michael Natterer <mitch src gnome org>]

commit ba1318dda9a0d606ccee64b50d9c22550d468996
Author: Michael Natterer <mitch gimp org>
Date:   Mon Jun 15 13:20:04 2015 +0200

    app, menus, plug-ins: add new Submenu Image -> Color Management
    
    and move the color profile menu entries there. Add a mapping so 3rd
    party plug-ins get moved to the new location automatically.
    
    Also, add a separator after "Duplicate" and move the "Transform"
    submenu to the top of the group that has "Scale", "Resize" etc.

 app/actions/image-actions.c     |   12 +++++++-----
 app/plug-in/plug-in-menu-path.c |   11 ++++++-----
 menus/image-menu.xml.in         |    9 +++++----
 plug-ins/common/lcms.c          |    4 ++--
 4 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
index ca705ef..08366f3 100644
--- a/app/actions/image-actions.c
+++ b/app/actions/image-actions.c
@@ -52,11 +52,13 @@ static const GimpActionEntry image_actions[] =
     NC_("image-action", "Image Menu"), NULL, NULL, NULL,
     GIMP_HELP_IMAGE_WINDOW },
 
-  { "image-menu",             NULL, NC_("image-action", "_Image")      },
-  { "image-mode-menu",        NULL, NC_("image-action", "_Mode")       },
-  { "image-precision-menu",   NULL, NC_("image-action", "_Precision")  },
-  { "image-transform-menu",   NULL, NC_("image-action", "_Transform")  },
-  { "image-guides-menu",      NULL, NC_("image-action", "_Guides")     },
+  { "image-menu",                  NULL, NC_("image-action", "_Image")     },
+  { "image-mode-menu",             NULL, NC_("image-action", "_Mode")      },
+  { "image-precision-menu",        NULL, NC_("image-action", "_Precision") },
+  { "image-color-management-menu", NULL, NC_("image-action",
+                                             "_Color Management")          },
+  { "image-transform-menu",        NULL, NC_("image-action", "_Transform") },
+  { "image-guides-menu",           NULL, NC_("image-action", "_Guides")    },
 
   { "colors-menu",            NULL, NC_("image-action", "_Colors")     },
   { "colors-info-menu",       NULL, NC_("image-action", "I_nfo")       },
diff --git a/app/plug-in/plug-in-menu-path.c b/app/plug-in/plug-in-menu-path.c
index 26a2542..07f14c1 100644
--- a/app/plug-in/plug-in-menu-path.c
+++ b/app/plug-in/plug-in-menu-path.c
@@ -60,11 +60,12 @@ static const MenuPathMapping menu_path_mappings[] =
   { "<Toolbox>/Xtns",                 NULL, "<Image>/Filters/Extensions"          },
   { "<Toolbox>/Help",                 NULL, "<Image>/Help"                        },
 
-  { "<Toolbox>/File/Acquire",         NULL, "<Image>/File/Create/Acquire"         },
-  { "<Toolbox>",                      NULL, "<Image>"                             },
-  { "<Image>/File/Acquire",           NULL, "<Image>/File/Create/Acquire"         },
-  { "<Image>/File/New",               NULL, "<Image>/File/Create"                 },
-  { NULL, NULL, NULL                                                              }
+  { "<Toolbox>/File/Acquire",           NULL, "<Image>/File/Create/Acquire"       },
+  { "<Toolbox>",                        NULL, "<Image>"                           },
+  { "<Image>/File/Acquire",             NULL, "<Image>/File/Create/Acquire"       },
+  { "<Image>/File/New",                 NULL, "<Image>/File/Create"               },
+  { "<Image>/Image/Mode/Color Profile", NULL, "<Image>/Image/Color Management"    },
+  { NULL, NULL, NULL }
 };
 
 
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index d8aa936..b9f2470 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -325,13 +325,12 @@
       <placeholder name="New">
         <menuitem action="image-duplicate" />
       </placeholder>
+      <separator />
       <menu action="image-mode-menu" name="Mode">
         <menuitem action="image-convert-rgb" />
         <menuitem action="image-convert-grayscale" />
         <menuitem action="image-convert-indexed" />
-        <separator />
-        <placeholder name="Color Profile" />
-        <separator />
+       <separator />
       </menu>
       <menu action="image-precision-menu" name="Precision">
         <menuitem action="image-convert-u8-linear" />
@@ -348,6 +347,9 @@
         <menuitem action="image-convert-double-gamma" />
         <separator />
       </menu>
+      <menu action="image-color-management-menu" name="Color Management">
+      </menu>
+      <separator />
       <menu action="image-transform-menu" name="Transform">
         <placeholder name="Flip">
           <menuitem action="image-flip-horizontal" />
@@ -361,7 +363,6 @@
         </placeholder>
         <separator />
       </menu>
-      <separator />
       <placeholder name="Resize">
         <menuitem action="image-resize" />
         <menuitem action="image-resize-to-layers" />
diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c
index a614ba3..b5d55f6 100644
--- a/plug-ins/common/lcms.c
+++ b/plug-ins/common/lcms.c
@@ -208,9 +208,9 @@ query (void)
                           apply_rgb_args, NULL);
 
   gimp_plugin_menu_register (PLUG_IN_PROC_SET,
-                             "<Image>/Image/Mode/Color Profile");
+                             "<Image>/Image/Color Management");
   gimp_plugin_menu_register (PLUG_IN_PROC_APPLY,
-                             "<Image>/Image/Mode/Color Profile");
+                             "<Image>/Image/Color Management");
 }
 
 static void