[gimp] app: remove the "Recent Filters" actions from action search again



commit 1449d3cb8f911bb56ca410e4ee7114f358922d51
Author: Michael Natterer <mitch gimp org>
Date:   Thu Nov 3 22:37:13 2016 +0100

    app: remove the "Recent Filters" actions from action search again
    
    The code was still checking for "plug-in-recent-*". Also, rename the
    actions to "filters-recent-*" instead of "filter-recent-*" for
    consistency with the other filters actions.

 app/actions/filters-actions.c     |    8 ++++----
 app/menus/filters-menu.c          |    2 +-
 app/widgets/gimpaction-history.c  |    2 +-
 app/widgets/gimpprocedureaction.c |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/app/actions/filters-actions.c b/app/actions/filters-actions.c
index 845ded8..ffc0e00 100644
--- a/app/actions/filters-actions.c
+++ b/app/actions/filters-actions.c
@@ -589,7 +589,7 @@ filters_actions_setup (GimpActionGroup *group)
 
   for (i = 0; i < n_entries; i++)
     {
-      entries[i].name        = g_strdup_printf ("filter-recent-%02d", i + 1);
+      entries[i].name        = g_strdup_printf ("filters-recent-%02d", i + 1);
       entries[i].icon_name   = NULL;
       entries[i].label       = "";
       entries[i].accelerator = "";
@@ -761,7 +761,7 @@ filters_actions_update (GimpActionGroup *group,
 
     for (i = 0; i < gimp_filter_history_length (group->gimp); i++)
       {
-        gchar    *name = g_strdup_printf ("filter-recent-%02d", i + 1);
+        gchar    *name = g_strdup_printf ("filters-recent-%02d", i + 1);
         gboolean  sensitive;
 
         proc = gimp_filter_history_nth (group->gimp, i);
@@ -872,7 +872,7 @@ filters_actions_history_changed (Gimp            *gimp,
       gchar       *name;
       gboolean     sensitive = FALSE;
 
-      name = g_strdup_printf ("filter-recent-%02d", i + 1);
+      name = g_strdup_printf ("filters-recent-%02d", i + 1);
       action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), name);
       g_free (name);
 
@@ -910,7 +910,7 @@ filters_actions_history_changed (Gimp            *gimp,
   for (; i < gimp_filter_history_size (gimp); i++)
     {
       GtkAction *action;
-      gchar     *name = g_strdup_printf ("filter-recent-%02d", i + 1);
+      gchar     *name = g_strdup_printf ("filters-recent-%02d", i + 1);
 
       action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), name);
       g_free (name);
diff --git a/app/menus/filters-menu.c b/app/menus/filters-menu.c
index 8d3f9a6..fa4c822 100644
--- a/app/menus/filters-menu.c
+++ b/app/menus/filters-menu.c
@@ -48,7 +48,7 @@ filters_menu_setup (GimpUIManager *manager,
       gchar *action_name;
       gchar *action_path;
 
-      action_name = g_strdup_printf ("filter-recent-%02d", i + 1);
+      action_name = g_strdup_printf ("filters-recent-%02d", i + 1);
       action_path = g_strdup_printf ("%s/Filters/Recently Used/Filters",
                                      ui_path);
 
diff --git a/app/widgets/gimpaction-history.c b/app/widgets/gimpaction-history.c
index 51e6bc2..179ceca 100644
--- a/app/widgets/gimpaction-history.c
+++ b/app/widgets/gimpaction-history.c
@@ -297,7 +297,7 @@ gimp_action_history_excluded_action (const gchar *action_name)
   return (g_str_has_suffix (action_name, "-set")            ||
           g_str_has_suffix (action_name, "-accel")          ||
           g_str_has_prefix (action_name, "context-")        ||
-          g_str_has_prefix (action_name, "plug-in-recent-") ||
+          g_str_has_prefix (action_name, "filters-recent-") ||
           g_strcmp0 (action_name, "plug-in-repeat") == 0    ||
           g_strcmp0 (action_name, "plug-in-reshow") == 0    ||
           g_strcmp0 (action_name, "dialogs-action-search") == 0);
diff --git a/app/widgets/gimpprocedureaction.c b/app/widgets/gimpprocedureaction.c
index 1337647..19195f5 100644
--- a/app/widgets/gimpprocedureaction.c
+++ b/app/widgets/gimpprocedureaction.c
@@ -165,7 +165,7 @@ gimp_procedure_action_activate (GtkAction *action)
   GimpProcedureAction *procedure_action = GIMP_PROCEDURE_ACTION (action);
 
   /* Not all actions have procedures associated with them, for example
-   * unused "plug-in-recent-[N]" actions, so check for NULL before we
+   * unused "filters-recent-[N]" actions, so check for NULL before we
    * invoke the action
    */
   if (procedure_action->procedure)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]