Merge lp:~mterry/unity-greeter/draw-bg into lp:unity-greeter

[Michael Terry]

During the 12.10 cycle, there was a bit of refactoring, and I was apparently responsible for accidentally dropping a piece of code that drew the window background onto the root window before closing and starting the session.

Without this piece of code, there was a decent chance of seeing graphic corruption during login before the desktop drew itself again. (i.e. a regression in bug 931967)

=== modified file 'src/greeter-list.vala'
--- src/greeter-list.vala	2012-10-18 16:07:50 +0000
+++ src/greeter-list.vala	2013-01-03 15:18:23 +0000
@@ -844,7 +844,7 @@
         background.draw_grid = false;
         background.queue_draw ();
 
-        UnityGreeter.singleton.start_session (get_lightdm_session ());
+        UnityGreeter.singleton.start_session (get_lightdm_session (), background);
     }
 
     public void login_complete ()

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-10-09 04:49:34 +0000
+++ src/unity-greeter.vala	2013-01-03 15:18:23 +0000
@@ -151,9 +151,12 @@
         return null;
     }
 
-    public void start_session (string? session)
+    public void start_session (string? session, Background bg)
     {
-        /* Set the background */
+        /* Paint our background onto the root window before we close our own window */
+        var c = new Cairo.Context (background_surface);
+        bg.draw_full (c, Background.DrawFlags.NONE);
+        c = null;
         refresh_background (Gdk.Screen.get_default (), background_surface);
 
         if (test_mode)

=== modified file 'tests/unity-greeter.vala'
--- tests/unity-greeter.vala	2012-09-17 17:58:30 +0000
+++ tests/unity-greeter.vala	2013-01-03 15:18:23 +0000
@@ -92,7 +92,7 @@
         return false;
     }
 
-    public void start_session (string? session)
+    public void start_session (string? session, Background bg)
     {
         session_started = true;
     }