Merge lp:~mfisch/unity-greeter/unity-greeter-lp973922 into lp:unity-greeter

[Matt Fischer]

This fixes the issue where the keyboard doesn't autoshow if it's selected when the greeter starts (selected from before). Since there's no WM here managing stuff this seems like the best solution

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2012-04-16 08:33:55 +0000
+++ src/main-window.vala	2012-06-30 04:44:19 +0000
@@ -225,4 +225,9 @@
 
         return true;
     }
+
+    public void set_keyboard_state()
+    {
+        menubar.set_keyboard_state();
+    }
 }
 
=== modified file 'src/menubar.vala'
--- src/menubar.vala	2012-03-21 20:00:39 +0000
+++ src/menubar.vala	2012-06-30 04:44:19 +0000
@@ -115,6 +115,15 @@
         return false;
     }
 
+    /* Due to LP #973922 the keyboard has to be loaded after the main window
+     * is shown and given focus. Therefore we don't enable the active state
+     * until now.
+     */
+    public void set_keyboard_state()
+    {
+        onscreen_keyboard_item.set_active (UGSettings.get_boolean (UGSettings.KEY_ONSCREEN_KEYBOARD));
+    }
+
     private string default_theme_name;
     private List<Indicator.Object> indicator_objects;
     private Gtk.MenuItem keyboard_item;
@@ -122,6 +131,7 @@
     private Gtk.Label keyboard_label = null;
     private Pid keyboard_pid = 0;
     private Gtk.Window? keyboard_window = null;
+    private Gtk.CheckMenuItem onscreen_keyboard_item;
 
     construct
     {
@@ -208,18 +218,17 @@
         hbox.add (image);
         a11y_item.show ();
         a11y_item.submenu = new Gtk.Menu ();
-        var item = new Gtk.CheckMenuItem.with_label (_("Onscreen keyboard"));
-        item.toggled.connect (keyboard_toggled_cb);
-        item.show ();
-        a11y_item.submenu.append (item);
-        item.set_active (UGSettings.get_boolean (UGSettings.KEY_ONSCREEN_KEYBOARD));
+        onscreen_keyboard_item = new Gtk.CheckMenuItem.with_label (_("Onscreen keyboard"));
+        onscreen_keyboard_item.toggled.connect (keyboard_toggled_cb);
+        onscreen_keyboard_item.show ();
+        a11y_item.submenu.append (onscreen_keyboard_item);
         high_contrast_item = new Gtk.CheckMenuItem.with_label (_("High Contrast"));
         high_contrast_item.toggled.connect (high_contrast_toggled_cb);
         high_contrast_item.add_accelerator ("activate", accel_group, Gdk.KEY_h, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE);
         high_contrast_item.show ();
         a11y_item.submenu.append (high_contrast_item);
         high_contrast_item.set_active (UGSettings.get_boolean (UGSettings.KEY_HIGH_CONTRAST));
-        item = new Gtk.CheckMenuItem.with_label (_("Screen Reader"));
+        var item = new Gtk.CheckMenuItem.with_label (_("Screen Reader"));
         item.toggled.connect (screen_reader_toggled_cb);
         item.add_accelerator ("activate", accel_group, Gdk.KEY_s, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE);
         item.show ();
 
=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-05-29 16:40:24 +0000
+++ src/unity-greeter.vala	2012-06-30 04:44:19 +0000
@@ -353,6 +353,7 @@
         debug ("Showing main window");
         main_window.show ();
         main_window.get_window ().focus (Gdk.CURRENT_TIME);
+        main_window.set_keyboard_state();
     }
 
     private void show_message_cb (string text, LightDM.MessageType type)