dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Revert "app: do not show the actions from <Dockable> GimpUIManager."

This reverts commit b795ae2296.
This commit is contained in:
Michael Natterer 2016-11-24 21:07:53 +01:00
parent 5e71512ddf
commit 1517a0952b
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/dialogs/action-search-dialog.c
View File

@ -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));
}
}
}

2
app/widgets/gimpaction-history.c
View File

@ -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);