=== modified file 'data/unity-greeter.conf' --- data/unity-greeter.conf 2011-08-24 10:45:15 +0000 +++ data/unity-greeter.conf 2011-08-26 14:35:06 +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 18:42:47 +0000 +++ src/unity-greeter.vala 2011-08-26 14:46:54 +0000 @@ -46,6 +46,8 @@ private string? test_username = null; private bool test_is_authenticated = false; + private string logo_path = null; + public UnityGreeter () { greeter = new LightDM.Greeter (); @@ -71,7 +73,9 @@ settings_daemon.start (); } - user_list = new UserList (); + logo_path = get_config_value ("greeter", "logo", Path.build_filename (Config.PKGDATADIR, "logo.png", null)); + + user_list = new UserList (logo_path); user_list.user_selected.connect (user_selected_cb); user_list.respond_to_prompt.connect (respond_to_prompt_cb); user_list.start_session.connect (start_session_cb); === modified file 'src/user-list.vala' --- src/user-list.vala 2011-08-25 15:28:31 +0000 +++ src/user-list.vala 2011-08-26 14:46:47 +0000 @@ -117,7 +117,7 @@ } } - public UserList () + public UserList (string logo_path) { can_focus = false; background_alpha = 1.0; @@ -128,7 +128,7 @@ 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_surface = new Cairo.ImageSurface.from_png (logo_path); logo_pattern = new Cairo.Pattern.for_surface (logo_surface); menubar = new Gtk.MenuBar ();