Merge lp:~kaihengfeng/unity-greeter/16.04-sru-fix-1571640 into lp:unity-greeter/16.04

[Kai-Heng Feng]

[Robert Ancell (robert-ancell)]

Does this require the u-s-d changes to be present? i.e. should we depend on that version of u-s-d?

[Kai-Heng Feng (kaihengfeng)]

Yes, the changes in u-s-d are required.

Should I make an update for dependency?

[Robert Ancell (robert-ancell)]

Yes, please do.

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-24 01:12:26 +0000
+++ debian/changelog	2016-06-22 08:34:00 +0000
@@ -1,3 +1,10 @@
+unity-greeter (16.04.2-0ubuntu2) xenial; urgency=medium
+
+  * Wait for unity-settings-daemon xsettings plugin is ready to avoid HiDPI
+  resolution changing (LP: #1571640)
+
+ -- Kai-Heng Feng <[e-mail]>  Wed, 22 Jun 2016 15:56:16 +0800
+
 unity-greeter (16.04.2-0ubuntu1) xenial; urgency=medium
 
   * New upstream release:

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2016-03-16 06:42:17 +0000
+++ src/unity-greeter.vala	2016-06-22 08:34:00 +0000
@@ -47,16 +47,15 @@
     private static Timer log_timer;
 
     private DialogDBusInterface dbus_object;
+    private SettingsDaemonDBusInterface  settings_daemon_proxy;
+    public signal void xsettings_ready ();
+    public signal void greeter_ready ();
 
     private UnityGreeter (bool test_mode_)
     {
         singleton = this;
         test_mode = test_mode_;
 
-        /* Prepare to set the background */
-        debug ("Creating background surface");
-        background_surface = create_root_surface (Gdk.Screen.get_default ());
-
         greeter = new LightDM.Greeter ();
         greeter.show_message.connect ((text, type) => { show_message (text, type); });
         greeter.show_prompt.connect ((text, type) => { show_prompt (text, type); });
@@ -98,44 +97,32 @@
                 warning ("Failed to load state from %s: %s\n", state_file, e.message);
         }
 
-        main_window = new MainWindow ();
-
-        Bus.own_name (BusType.SESSION, "com.canonical.UnityGreeter", BusNameOwnerFlags.NONE);
-
-        dbus_object = new DialogDBusInterface ();
-        dbus_object.open_dialog.connect ((type) =>
-        {
-            ShutdownDialogType dialog_type;
-            switch (type)
-            {
-            default:
-            case 1:
-                dialog_type = ShutdownDialogType.LOGOUT;
-                break;
-            case 2:
-                dialog_type = ShutdownDialogType.RESTART;
-                break;
-            }
-            main_window.show_shutdown_dialog (dialog_type);
-        });
-        dbus_object.close_dialog.connect ((type) => { main_window.close_shutdown_dialog (); });
-        Bus.own_name (BusType.SESSION, "com.canonical.Unity", BusNameOwnerFlags.NONE,
-                      (c) =>
-                      {
-                          try
-                          {
-                              c.register_object ("/org/gnome/SessionManager/EndSessionDialog", dbus_object);
-                          }
-                          catch (Error e)
-                          {
-                              warning ("Failed to register /org/gnome/SessionManager/EndSessionDialog: %s", e.message);
-                          }
-                      },
-                      null,
-                      () => debug ("Failed to acquire name com.canonical.Unity"));
-
-        start_fake_wm ();
-        Gdk.threads_add_idle (ready_cb);
+        /* Render things after xsettings is ready */
+        xsettings_ready.connect ( xsettings_ready_cb );
+
+        GLib.Bus.watch_name (BusType.SESSION, "org.gnome.SettingsDaemon", BusNameWatcherFlags.NONE,
+                             (c, name, owner) =>
+                             {
+                                try {
+                                    settings_daemon_proxy = GLib.Bus.get_proxy_sync (
+                                        BusType.SESSION, "org.gnome.SettingsDaemon", "/org/gnome/SettingsDaemon");
+                                    settings_daemon_proxy.plugin_activated.connect (
+                                        (name) =>
+                                        {
+                                            if (name == "xsettings") {
+                                                debug ("xsettings is ready");
+                                                xsettings_ready ();
+                                            }
+                                        }
+                                    );
+                                }
+                                catch (Error e)
+                                {
+                                    debug ("Failed to get USD proxy, proceed anyway");
+                                    xsettings_ready ();
+                                }
+                            },
+                            null);
     }
 
     public string? get_state (string key)
@@ -456,6 +443,53 @@
         stderr.printf ("[%+.2fs] %s %s\n", log_timer.elapsed (), prefix, message);
     }
 
+    private void xsettings_ready_cb ()
+    {
+        /* Prepare to set the background */
+        debug ("Creating background surface");
+        background_surface = create_root_surface (Gdk.Screen.get_default ());
+
+        main_window = new MainWindow ();
+
+        Bus.own_name (BusType.SESSION, "com.canonical.UnityGreeter", BusNameOwnerFlags.NONE);
+
+        dbus_object = new DialogDBusInterface ();
+        dbus_object.open_dialog.connect ((type) =>
+        {
+            ShutdownDialogType dialog_type;
+            switch (type)
+            {
+            default:
+            case 1:
+                dialog_type = ShutdownDialogType.LOGOUT;
+                break;
+            case 2:
+                dialog_type = ShutdownDialogType.RESTART;
+                break;
+            }
+            main_window.show_shutdown_dialog (dialog_type);
+        });
+        dbus_object.close_dialog.connect ((type) => { main_window.close_shutdown_dialog (); });
+        Bus.own_name (BusType.SESSION, "com.canonical.Unity", BusNameOwnerFlags.NONE,
+                      (c) =>
+                      {
+                          try
+                          {
+                              c.register_object ("/org/gnome/SessionManager/EndSessionDialog", dbus_object);
+                          }
+                          catch (Error e)
+                          {
+                              warning ("Failed to register /org/gnome/SessionManager/EndSessionDialog: %s", e.message);
+                          }
+                      },
+                      null,
+                      () => debug ("Failed to acquire name com.canonical.Unity"));
+
+        start_fake_wm ();
+        Gdk.threads_add_idle (ready_cb);
+        greeter_ready ();
+    }
+
     public static int main (string[] args)
     {
         /* Protect memory from being paged to disk, as we deal with passwords */
@@ -570,8 +604,11 @@
         debug ("Creating Unity Greeter");
         var greeter = new UnityGreeter (do_test_mode);
 
-        debug ("Showing greeter");
-        greeter.show ();
+        greeter.greeter_ready.connect (() => {
+            debug ("Showing greeter");
+            greeter.show ();
+        });
+
 
         if (!do_test_mode)
         {
@@ -664,3 +701,10 @@
         close_dialog ();
     }
 }
+
+[DBus (name="org.gnome.SettingsDaemon")]
+private interface SettingsDaemonDBusInterface : Object
+{
+    public signal void plugin_activated (string name);
+    public signal void plugin_deactivated (string name);
+}