From 12ef22e0c0a6fe8cb16bd8669d74379ae1377e4b Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Mon, 11 Feb 2002 13:16:38 +0000
Subject: [PATCH] small hack that strips the ellipses from the "Repeat" and
 "Re-Show" menu

2002-02-11  Michael Natterer  <mitch@gimp.org>

	* app/plug-in/plug-in.c: small hack that strips the ellipses
	from the "Repeat" and "Re-Show" menu entries.

	* plug-ins/mosaic/mosaic.c: register under "Filters/Distorts", not
	"Filters/Render" because this plug-in changes the image and
	doesn't render something from scratch.
---
 ChangeLog                            | 9 +++++++++
 app/actions/plug-in-commands.c       | 6 ++++++
 app/gui/plug-in-commands.c           | 6 ++++++
 app/gui/plug-in-menus.c              | 6 ++++++
 app/menus/plug-in-menus.c            | 6 ++++++
 app/plug-in/gimpplugin-message.c     | 6 ++++++
 app/plug-in/gimpplugin-progress.c    | 6 ++++++
 app/plug-in/gimpplugin.c             | 6 ++++++
 app/plug-in/gimppluginmanager-call.c | 6 ++++++
 app/plug-in/gimppluginmanager-run.c  | 6 ++++++
 app/plug-in/gimppluginmanager.c      | 6 ++++++
 app/plug-in/gimppluginshm.c          | 6 ++++++
 app/plug-in/plug-in-def.c            | 6 ++++++
 app/plug-in/plug-in-message.c        | 6 ++++++
 app/plug-in/plug-in-params.c         | 6 ++++++
 app/plug-in/plug-in-progress.c       | 6 ++++++
 app/plug-in/plug-in-run.c            | 6 ++++++
 app/plug-in/plug-in-shm.c            | 6 ++++++
 app/plug-in/plug-in.c                | 6 ++++++
 app/plug-in/plug-ins.c               | 6 ++++++
 plug-ins/common/mosaic.c             | 2 +-
 plug-ins/mosaic/mosaic.c             | 2 +-
 22 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 05c66e9da4..01d9602353 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-11  Michael Natterer  <mitch@gimp.org>
+
+	* app/plug-in/plug-in.c: small hack that strips the ellipses
+	from the "Repeat" and "Re-Show" menu entries.
+
+	* plug-ins/mosaic/mosaic.c: register under "Filters/Distorts", not
+	"Filters/Render" because this plug-in changes the image and
+	doesn't render something from scratch.
+
 2002-02-11  Sven Neumann  <sven@gimp.org>
 
 	* TODO.xml: updated.
diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c
index ce07b2bf05..22d29b6910 100644
--- a/app/actions/plug-in-commands.c
+++ b/app/actions/plug-in-commands.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/gui/plug-in-commands.c b/app/gui/plug-in-commands.c
index ce07b2bf05..22d29b6910 100644
--- a/app/gui/plug-in-commands.c
+++ b/app/gui/plug-in-commands.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/gui/plug-in-menus.c b/app/gui/plug-in-menus.c
index ce07b2bf05..22d29b6910 100644
--- a/app/gui/plug-in-menus.c
+++ b/app/gui/plug-in-menus.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c
index ce07b2bf05..22d29b6910 100644
--- a/app/menus/plug-in-menus.c
+++ b/app/menus/plug-in-menus.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/gimpplugin-message.c
+++ b/app/plug-in/gimpplugin-message.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/gimpplugin-progress.c
+++ b/app/plug-in/gimpplugin-progress.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/gimpplugin.c
+++ b/app/plug-in/gimpplugin.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/gimppluginmanager-call.c
+++ b/app/plug-in/gimppluginmanager-call.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/gimppluginmanager-run.c b/app/plug-in/gimppluginmanager-run.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/gimppluginmanager-run.c
+++ b/app/plug-in/gimppluginmanager-run.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/gimppluginmanager.c
+++ b/app/plug-in/gimppluginmanager.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/gimppluginshm.c b/app/plug-in/gimppluginshm.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/gimppluginshm.c
+++ b/app/plug-in/gimppluginshm.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/plug-in-def.c b/app/plug-in/plug-in-def.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/plug-in-def.c
+++ b/app/plug-in/plug-in-def.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/plug-in-message.c
+++ b/app/plug-in/plug-in-message.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/plug-in-params.c
+++ b/app/plug-in/plug-in-params.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/plug-in-progress.c b/app/plug-in/plug-in-progress.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/plug-in-progress.c
+++ b/app/plug-in/plug-in-progress.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/plug-in-run.c b/app/plug-in/plug-in-run.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/plug-in-run.c
+++ b/app/plug-in/plug-in-run.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/plug-in-shm.c b/app/plug-in/plug-in-shm.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/plug-in-shm.c
+++ b/app/plug-in/plug-in-shm.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/plug-in.c b/app/plug-in/plug-in.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/plug-in.c
+++ b/app/plug-in/plug-in.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c
index ce07b2bf05..22d29b6910 100644
--- a/app/plug-in/plug-ins.c
+++ b/app/plug-in/plug-ins.c
@@ -1406,11 +1406,17 @@ plug_in_set_menu_sensitivity (GimpImageType type)
           if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
 	    {
               gchar *basename;
+              gchar *ellipses;
               gchar *repeat;
               gchar *reshow;
 
               basename = g_path_get_basename (proc_def->menu_path);
 
+              ellipses = strstr (basename, "...");
+
+              if (ellipses && ellipses == (basename + strlen (basename) - 3))
+                *ellipses = '\0';
+
               repeat = g_strdup_printf (_("Repeat \"%s\""), basename);
               reshow = g_strdup_printf (_("Re-show \"%s\""), basename);
 
diff --git a/plug-ins/common/mosaic.c b/plug-ins/common/mosaic.c
index 820fec84e0..37760f9068 100644
--- a/plug-ins/common/mosaic.c
+++ b/plug-ins/common/mosaic.c
@@ -329,7 +329,7 @@ query (void)
 			  "Spencer Kimball",
 			  "Spencer Kimball & Peter Mattis",
 			  "1996",
-			  N_("<Image>/Filters/Render/Pattern/Mosaic..."),
+			  N_("<Image>/Filters/Distorts/Mosaic..."),
 			  "RGB*, GRAY*",
 			  GIMP_PLUGIN,
 			  G_N_ELEMENTS (args), nreturn_vals,
diff --git a/plug-ins/mosaic/mosaic.c b/plug-ins/mosaic/mosaic.c
index 820fec84e0..37760f9068 100644
--- a/plug-ins/mosaic/mosaic.c
+++ b/plug-ins/mosaic/mosaic.c
@@ -329,7 +329,7 @@ query (void)
 			  "Spencer Kimball",
 			  "Spencer Kimball & Peter Mattis",
 			  "1996",
-			  N_("<Image>/Filters/Render/Pattern/Mosaic..."),
+			  N_("<Image>/Filters/Distorts/Mosaic..."),
 			  "RGB*, GRAY*",
 			  GIMP_PLUGIN,
 			  G_N_ELEMENTS (args), nreturn_vals,