Re-grab focus after failed login attempt

LockWindow.py

@@ -76,7 +76,7 @@ class LockWindow(Gtk.Window):
         self.logoutButton.connect('clicked', lambda w: self._logout())
         self.unlockButton.connect('clicked', lambda w: self._tryUnlock())
 
-        self.reset(True)
+        self.reset(False, True)
 
         self.deviceManager = self.display.get_device_manager()
 
@@ -100,7 +100,7 @@ class LockWindow(Gtk.Window):
         self.logoutButton.set_sensitive(self._enableLogoutButton)
         self.unlockButton.set_sensitive(self._enableUnlockButton)
 
-    def reset(self, resetButtons = False):
+    def reset(self, regrab = True, resetButtons = False):
         if resetButtons:
             self._enablePromptEntry = True
             self._enableLogoutButton = False
@@ -110,8 +110,8 @@ class LockWindow(Gtk.Window):
         self.messageLabel.set_label('')
         self._update()
 
-        self.promptEntry.grab_focus()
-
+        if regrab:
+            self._grabDevices(None, None)
 
     def updateLockMessage(self, username, logoutTime = None):
         if logoutTime is None:
@@ -153,4 +153,4 @@ class LockWindow(Gtk.Window):
         self._ungrabDevices()
 
         self.hide()
-        self.reset(True)
+        self.reset(False, True)

pylock.py

@@ -99,7 +99,7 @@ def logout():
     except:
         pass
 
-    window.reset()
+    window.reset(False)
 
 def updateTimeout(timeLeft):
     window.updateLockMessage(args.username, timeLeft)