[gimp/gimp-2-8] actions: dock-close had a default shortcut colliding with view-close.



commit c947260d2db0d761668dd7b16f195f9ed3d458c6
Author: Jehan <jehan girinstud io>
Date:   Wed Dec 12 15:14:42 2012 +0900

    actions: dock-close had a default shortcut colliding with view-close.
    
    When the accelerator is NULL, gtk_action_group_add_action_with_accel()
    would use the default one for the stock icon used. And GTK_STOCK_CLOSE
    default accelerator is "<Primary>w" which we already use for view-close.
    We must use empty string when we want no default accelerator.
    (cherry picked from commit 28669b07d193515ee5fc4bc35b154909a9d35169)

 app/actions/dock-actions.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/app/actions/dock-actions.c b/app/actions/dock-actions.c
index f24f0ca..37b9fa7 100644
--- a/app/actions/dock-actions.c
+++ b/app/actions/dock-actions.c
@@ -46,7 +46,7 @@ static const GimpActionEntry dock_actions[] =
     GIMP_HELP_DOCK_CHANGE_SCREEN },
 
   { "dock-close", GTK_STOCK_CLOSE,
-    NC_("dock-action", "Close Dock"), NULL, NULL,
+    NC_("dock-action", "Close Dock"), "", NULL,
     G_CALLBACK (window_close_cmd_callback),
     GIMP_HELP_DOCK_CLOSE },
 


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