Merge lp:~marmuta/unity-greeter/onboard-keep-focus into lp:unity-greeter

[marmuta]

Hi all,
here is a fix for Bug #878184 to allow entering the password with onboard again. I just had to keep the input focus on the passwork entry.
Have a look, please.

[lp:~marmuta/unity-greeter/onboard-keep-focus]

364. By marmuta on 2012-03-21

Keep the input focus on prompt_entry when starting Onboard (LP #878184)

[Robert Ancell (robert-ancell)]

Thanks, will review this next week.

[Robert Ancell (robert-ancell)]

Thanks for that. I can confirm the patch works. It's a bit weird to explicitly focus on the user list if the new window is not focusable, but as it doesn't work without it and the feature is quite important I'll take it as it is. I've pushed with some minor code style changes.

review: Approve

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-03-20 06:48:59 +0000
+++ src/unity-greeter.vala	2012-03-21 16:13:21 +0000
@@ -678,13 +678,22 @@
         }
     }
 
-    private static Gdk.FilterReturn focus_upon_map (X.Event xevent, Gdk.Event event)
+    private Gdk.FilterReturn focus_upon_map (X.Event xevent, Gdk.Event event)
     {
         if (xevent.type == X.EventType.MapNotify)
         {
             var display = Gdk.Display.get_default ();
             var win = Gdk.X11Window.foreign_new_for_display (display, xevent.xmap.window);
-            win.focus(Gdk.CURRENT_TIME);
+
+            /* Focus windows that like to be focused (Onboard doesn't) */
+            if (win.get_accept_focus())
+            {
+                win.focus(Gdk.CURRENT_TIME);
+            }
+            else
+            {
+                user_list.focus_prompt ();
+            }
         }
         return Gdk.FilterReturn.CONTINUE;
     }

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-03-14 17:24:15 +0000
+++ src/user-list.vala	2012-03-21 16:13:21 +0000
@@ -371,8 +371,13 @@
             else
                 accessible.set_name (_("Enter password"));
         }
+        focus_prompt ();
+        redraw_login_box ();
+    }
+
+    public void focus_prompt ()
+    {
         prompt_entry.grab_focus ();
-        redraw_login_box ();
     }
 
     public void show_authenticated (bool successful = true)