From 47127014155a9474a47d689a1a6931ca9ede8f5e Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Sun, 18 May 2014 22:46:05 +0200
Subject: [PATCH] app, plug-ins: move everything from Render->Clouds to the new
 Render->Noise

because that's what they are and what most menu labels in there says.
Keep the "Clouds" menu around for 3rd party plug-ins, not sure if it's
right to auto-map it to "Noise" automatically.
---
 app/actions/plug-in-actions.c                    | 2 ++
 menus/image-menu.xml.in                          | 5 +++--
 plug-ins/common/noise-solid.c                    | 2 +-
 plug-ins/script-fu/scripts/difference-clouds.scm | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/actions/plug-in-actions.c b/app/actions/plug-in-actions.c
index b483af85af..6f1e128763 100644
--- a/app/actions/plug-in-actions.c
+++ b/app/actions/plug-in-actions.c
@@ -113,6 +113,8 @@ static const GimpActionEntry plug_in_actions[] =
                                              "_Clouds")           },
   { "plug-in-render-nature-menu",  NULL, NC_("plug-in-action",
                                              "_Nature")           },
+  { "plug-in-render-noise-menu",   NULL, NC_("plug-in-action",
+                                             "N_oise")            },
   { "plug-in-render-pattern-menu", NULL, NC_("plug-in-action",
                                              "_Pattern")          },
   { "plug-in-web-menu",            NULL, NC_("plug-in-action",
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index 1424f24698..1bb58c82e6 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -700,13 +700,14 @@
         <menuitem action="filters-tile-seamless" />
       </menu>
       <menu action="plug-in-render-menu" name="Render">
-        <menu action="plug-in-render-clouds-menu" name="Clouds">
+        <menu action="plug-in-render-clouds-menu" name="Clouds" />
+        <menu action="plug-in-render-nature-menu" name="Nature" />
+        <menu action="plug-in-render-noise-menu" name="Noise">
 	  <menuitem action="filters-noise-cell" />
 	  <menuitem action="filters-noise-perlin" />
 	  <menuitem action="filters-plasma" />
 	  <menuitem action="filters-noise-simplex" />
 	</menu>
-        <menu action="plug-in-render-nature-menu" name="Nature" />
         <menu action="plug-in-render-pattern-menu" name="Pattern">
 	  <menuitem action="filters-checkerboard" />
 	  <menuitem action="filters-grid" />
diff --git a/plug-ins/common/noise-solid.c b/plug-ins/common/noise-solid.c
index 72354c9ee4..4c9ffed066 100644
--- a/plug-ins/common/noise-solid.c
+++ b/plug-ins/common/noise-solid.c
@@ -185,7 +185,7 @@ query (void)
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
-  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Render/Clouds");
+  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Render/Noise");
 }
 
 
diff --git a/plug-ins/script-fu/scripts/difference-clouds.scm b/plug-ins/script-fu/scripts/difference-clouds.scm
index 45ac44d908..49862e9e87 100644
--- a/plug-ins/script-fu/scripts/difference-clouds.scm
+++ b/plug-ins/script-fu/scripts/difference-clouds.scm
@@ -74,4 +74,4 @@
                     SF-DRAWABLE    "Drawable"        0)
 
 (script-fu-menu-register "script-fu-difference-clouds"
-			 "<Image>/Filters/Render/Clouds")
+			 "<Image>/Filters/Render/Noise")