Merge branch 'master' of fluxbox@git.fluxbox.org:fluxbox

Conflicts:

	ChangeLog

1 files changed, 2 insertions, 1 deletions

diff --git a/src/Screen.hh b/src/Screen.hh
index e77056d..269cf25 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -237,7 +237,6 @@ public:
     void keyPressEvent(XKeyEvent &ke);
     void keyReleaseEvent(XKeyEvent &ke);
     void buttonPressEvent(XButtonEvent &be);
-    void notifyUngrabKeyboard();
 
     /**
      * Cycles focus of windows
@@ -247,6 +246,8 @@ public:
      */
     void cycleFocus(int opts = 0, const ClientPattern *pat = 0, bool reverse = false);
 
+    bool isCycling() const { return m_cycling; }
+
     /**
      * Creates an empty menu with specified label
      * @param label for the menu