Merge lp:~mterry/unity-greeter/custom-logo into lp:~robert-ancell/unity-greeter/trunk

[Michael Terry]

=== modified file 'data/unity-greeter.conf'
--- data/unity-greeter.conf	2011-08-23 02:11:54 +0000
+++ data/unity-greeter.conf	2011-08-26 17:16:29 +0000
@@ -1,7 +1,6 @@
 #
 # background = Background file to use, either an image path or a color (e.g. #772953)
-# os-name = Name of this OS
-# os-version = Version of this OS
+# logo = Logo file to use
 # theme-name = GTK+ theme to use
 # font-name = Font to use
 # xft-antialias = Whether to antialias Xft fonts (true or false)
@@ -11,8 +10,7 @@
 #
 [greeter]
 background=/usr/share/backgrounds/warty-final-ubuntu.png
-os-name=ubuntu
-os-version=11.10
+logo=/usr/share/unity-greeter/logo.png
 theme-name=Ambiance
 icon-theme-name=ubuntu-mono-dark
 font-name=Ubuntu 11

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2011-08-25 08:34:24 +0000
+++ src/unity-greeter.vala	2011-08-26 17:16:29 +0000
@@ -76,6 +76,7 @@
         user_list.respond_to_prompt.connect (respond_to_prompt_cb);
         user_list.start_session.connect (start_session_cb);
         user_list.default_background = get_config_value ("greeter", "background", "#000000");
+        user_list.set_logo (get_config_value ("greeter", "logo", Path.build_filename (Config.PKGDATADIR, "logo.png", null)));
         user_list.show ();
 
         foreach (var session in LightDM.get_sessions ())

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2011-08-25 08:33:14 +0000
+++ src/user-list.vala	2011-08-26 17:16:29 +0000
@@ -117,6 +117,12 @@
         }
     }
 
+    public void set_logo (string logo_path)
+    {
+      logo_surface = new Cairo.ImageSurface.from_png (logo_path);
+      logo_pattern = new Cairo.Pattern.for_surface (logo_surface);
+    }
+
     public UserList ()
     {
         can_focus = false;
@@ -128,9 +134,6 @@
         FreeType.new_face (library, "/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf", 0, out face);
         font_face = Cairo.ft_font_face_create_for_ft_face (face, 0);
 
-        logo_surface = new Cairo.ImageSurface.from_png (Path.build_filename (Config.PKGDATADIR, "logo.png", null));
-        logo_pattern = new Cairo.Pattern.for_surface (logo_surface);
-
         menubar = new Gtk.MenuBar ();
 
         menubar.draw.connect_after (menubar_draw_cb);