Merge lp:~brandontschaefer/nux/lp.1157879-fix into lp:nux

[Brandon Schaefer]

Fixes a race condition when opening then closing the dash quickly. As the X event buffer doesn't flush until after the dash has closed causing the dash to get re-focused when the event buffer gets flushed.

[Andrea Azzarone (azzar1)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=panda-pbuilder,distribution=raring,flavor=armhf/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/118

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'NuxGraphics/XInputWindow.cpp'
--- NuxGraphics/XInputWindow.cpp	2012-12-17 19:04:50 +0000
+++ NuxGraphics/XInputWindow.cpp	2013-03-21 21:21:21 +0000
@@ -364,6 +364,7 @@
   void XInputWindow::SetInputFocus()
   {
     XSetInputFocus(display_, window_, RevertToParent, CurrentTime);
+    XSync(display_, False);
   }
 
   void XInputWindow::Hide()