From dd4808aa9a4559b00ff2055b9de2d5625309eada Mon Sep 17 00:00:00 2001 From: Lionel Le Folgoc Date: Sat, 28 Jul 2012 22:46:45 +0200 Subject: Revert "Add the possibilty to specify another greeter.ui path in the configuration file" We're discussing a better method to make both lubuntu and xubuntu happy with that. --- data/lightdm-gtk-greeter.conf | 2 -- src/lightdm-gtk-greeter.c | 12 +----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/data/lightdm-gtk-greeter.conf b/data/lightdm-gtk-greeter.conf index 4e2fdd9..f8b9def 100644 --- a/data/lightdm-gtk-greeter.conf +++ b/data/lightdm-gtk-greeter.conf @@ -7,7 +7,6 @@ # xft-dpi = Resolution for Xft in dots per inch (e.g. 96) # xft-hintstyle = What degree of hinting to use (hintnone, hintslight, hintmedium, or hintfull) # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr) -# ui-path = Specify the path for another greeter.ui definition # [greeter] #background= @@ -18,4 +17,3 @@ #xft-dpi= #xft-hintstyle= #xft-rgba= -#ui-path= diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c index 58c2d48..bdb5cba 100644 --- a/src/lightdm-gtk-greeter.c +++ b/src/lightdm-gtk-greeter.c @@ -824,18 +824,8 @@ main (int argc, char **argv) gchar **path; gtk_icon_theme_get_search_path (gtk_icon_theme_get_default (), &path, NULL); - /* Load UI file */ builder = gtk_builder_new (); - value = g_key_file_get_value (config, "greeter", "ui-path", NULL); - if (value) - { - if (!gtk_builder_add_from_file (builder, value, &error)) - { - g_warning ("Error loading specific UI: %s", error->message); - return EXIT_FAILURE; - } - } - else if (!gtk_builder_add_from_file (builder, GREETER_DATA_DIR "/greeter.ui", &error)) + if (!gtk_builder_add_from_file (builder, GREETER_DATA_DIR "/greeter.ui", &error)) { g_warning ("Error loading UI: %s", error->message); return EXIT_FAILURE; -- cgit v1.2.1