Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 5 insertions, 4 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 8b605e7..9e340f8 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -39,7 +39,7 @@
 #include "FbTk/IntMenuItem.hh"
 #include "FbTk/MenuSeparator.hh"
 #include "FocusModelMenuItem.hh"
-#include "RadioMenuItem.hh"
+#include "FbTk/RadioMenuItem.hh"
 
 // menus
 #include "FbMenu.hh"
@@ -1098,6 +1098,9 @@ void BScreen::changeWorkspaceID(unsigned int id, bool revert) {
         id == m_current_workspace->workspaceID())
         return;
 
+    /* Ignore all EnterNotify events until the pointer actually moves */
+    this->focusControl().ignoreAtPointer();
+
     FbTk::App::instance()->sync(false);
 
     FluxboxWindow *focused = FocusControl::focusedFbWindow();
@@ -1228,10 +1231,8 @@ bool BScreen::isKdeDockapp(Window client) const {
 bool BScreen::addKdeDockapp(Window client) {
 
     XSelectInput(FbTk::App::instance()->display(), client, StructureNotifyMask);
-    char intbuff[16];
-    sprintf(intbuff, "%d", screenNumber());
     string atom_name("_NET_SYSTEM_TRAY_S");
-    atom_name += intbuff; // append number
+    atom_name += FbTk::StringUtil::number2String(screenNumber());
     // find the right atomhandler that has the name: _NET_SYSTEM_TRAY_S<num>
     AtomHandler *handler = Fluxbox::instance()->getAtomHandler(atom_name);
     FbTk::EventHandler *evh  = 0;