[gimp] Bug 774890 - "Keyboard shortcuts" dialog does not show all actions

[Michael Natterer <mitch src gnome org>]

commit 1517a0952bf56ec7382e3cfea621ca6e4c21d64d
Author: Michael Natterer <mitch gimp org>
Date:   Thu Nov 24 21:07:53 2016 +0100

    Bug 774890 - "Keyboard shortcuts" dialog does not show all actions
    
    Revert "app: do not show the actions from <Dockable> GimpUIManager."
    
    This reverts commit b795ae2296ebb4711d7fc6881637506fc422f3ee.

 app/dialogs/action-search-dialog.c |   24 ++++++------------------
 app/widgets/gimpaction-history.c   |    2 --
 2 files changed, 6 insertions(+), 20 deletions(-)
---
diff --git a/app/dialogs/action-search-dialog.c b/app/dialogs/action-search-dialog.c
index 44059fb..3b62787 100644
--- a/app/dialogs/action-search-dialog.c
+++ b/app/dialogs/action-search-dialog.c
@@ -81,10 +81,10 @@ action_search_history_and_actions (GimpSearchPopup *popup,
                                    const gchar     *keyword,
                                    gpointer         data)
 {
-  GList *menus;
-  GList *list;
-  GList *history_actions = NULL;
-  Gimp  *gimp;
+  GList         *menus;
+  GList         *list;
+  GList         *history_actions = NULL;
+  Gimp          *gimp;
 
   g_return_if_fail (GIMP_IS_GIMP (data));
 
@@ -117,13 +117,6 @@ action_search_history_and_actions (GimpSearchPopup *popup,
         {
           GimpUIManager *manager = managers->data;
 
-          /* Ignore dockable actions which are similar to the Dialogs-*
-           * actions except they always add a dock (instead of just
-           * showing it when already present).
-           */
-          if (g_strcmp0 (manager->name, "<Dockable>") == 0)
-            continue;
-
           for (list = gtk_ui_manager_get_action_groups (GTK_UI_MANAGER (manager));
                list;
                list = g_list_next (list))
@@ -169,11 +162,8 @@ action_search_history_and_actions (GimpSearchPopup *popup,
                        */
                       for (list3 = history_actions; list3; list3 = g_list_next (list3))
                         {
-                          const gchar *action_name;
-
-                          action_name = gtk_action_get_name (GTK_ACTION (list3->data));
-
-                          if (g_strcmp0 (action_name, name) == 0)
+                          if (strcmp (gtk_action_get_name (GTK_ACTION (list3->data)),
+                                      name) == 0)
                             {
                               is_redundant = TRUE;
                               break;
@@ -183,8 +173,6 @@ action_search_history_and_actions (GimpSearchPopup *popup,
                       if (! is_redundant)
                         {
                           gimp_search_popup_add_result (popup, action, section);
-                          history_actions = g_list_prepend (history_actions,
-                                                            g_object_ref (action));
                         }
                     }
                 }
diff --git a/app/widgets/gimpaction-history.c b/app/widgets/gimpaction-history.c
index 5262115..2487635 100644
--- a/app/widgets/gimpaction-history.c
+++ b/app/widgets/gimpaction-history.c
@@ -284,8 +284,6 @@ gimp_action_history_search (Gimp                *gimp,
             {
               GimpUIManager *manager = managers->data;
 
-              if (g_strcmp0 (manager->name, "<Dockable>") == 0)
-                continue;
               action = gimp_ui_manager_find_action (manager, NULL,
                                                     item->action_name);