[banshee] [Nereid] Don't capture 's' if keybindings disabled



commit ebb3c9360d304ebff5973bc1db86e1dad4c8ddf2
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Fri Mar 12 11:52:38 2010 -0800

    [Nereid] Don't capture 's' if keybindings disabled
    
    Thanks to Frank Ziegler for catching this and suggesting a fix; fixes
    bgo#611990.

 src/Clients/Nereid/Nereid/PlayerInterface.cs |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/src/Clients/Nereid/Nereid/PlayerInterface.cs b/src/Clients/Nereid/Nereid/PlayerInterface.cs
index 59ee625..d23df86 100644
--- a/src/Clients/Nereid/Nereid/PlayerInterface.cs
+++ b/src/Clients/Nereid/Nereid/PlayerInterface.cs
@@ -570,7 +570,7 @@ namespace Nereid
 
                     // Reinstate the AccelGroup as soon as the focus leaves the entry
                     Focus.FocusOutEvent += OnEntryFocusOutEvent;
-                 }
+                }
             } else {
                 if (!accel_group_active) {
                     AddAccelGroup (ActionService.UIManager.AccelGroup);
@@ -585,8 +585,14 @@ namespace Nereid
                     }
                     break;
 
-                case Gdk.Key.S:  case Gdk.Key.s:
-                case Gdk.Key.F3: case Gdk.Key.slash:
+                case Gdk.Key.S:
+                case Gdk.Key.s:
+                case Gdk.Key.slash:
+                    if (!disable_keybindings) {
+                        focus_search = true;
+                    }
+                    break;
+                case Gdk.Key.F3:
                     focus_search = true;
                     break;
                 case Gdk.Key.F11:



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