Merge lp:~azzar1/unity/fix-transparent-background into lp:unity

[Andrea Azzarone]

Lockscreen: always draw the background-color in the lockscreen

This is to avoid showing a transparent background if the background file is missing.

Always draw the background-color in the lockscreen to avoid showing a transparent background.

[Marco Trevisan (Treviño) (3v1n0)]

Thanks

review: Approve

=== modified file 'lockscreen/BackgroundSettings.cpp'
--- lockscreen/BackgroundSettings.cpp	2017-02-22 01:03:39 +0000
+++ lockscreen/BackgroundSettings.cpp	2017-07-06 14:49:14 +0000
@@ -77,18 +77,16 @@
     bg_surface = gnome_bg_create_surface(gnome_bg, root_window, geo.width, geo.height, FALSE);
   }
 
+  auto const& bg_color = settings.background_color();
+  cairo_set_source_rgb(c, bg_color.red, bg_color.green, bg_color.blue);
+  cairo_paint(c);
+
   if (bg_surface)
   {
     cairo_set_source_surface(c, bg_surface, 0, 0);
     cairo_paint(c);
     cairo_surface_destroy(bg_surface);
   }
-  else
-  {
-    auto const& bg_color = settings.background_color();
-    cairo_set_source_rgb(c, bg_color.red, bg_color.green, bg_color.blue);
-    cairo_paint(c);
-  }
 
   cairo_surface_set_device_scale(cairo_graphics.GetSurface(), scale, scale);