diff options
| author | Ray Strode <rstrode@redhat.com> | 2012-03-15 15:46:27 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-03-15 15:46:27 -0400 |
| commit | 310bf73ece1e32893b28b68bb6c5748fc026ac33 (patch) | |
| tree | c74ef1d523e0c55657420bd551208edb08590d8d /gui | |
| parent | 7109d0b32e2383f34768ba02901b1da58fdce756 (diff) | |
| download | gdm-310bf73ece1e32893b28b68bb6c5748fc026ac33.tar.gz | |
greeter: drop 'nochooser' banner text
The admin can always change the banner text when
toggling disable_user_list, so there's no point in
having both.
This will maybe migration to gsettings easier.
https://bugzilla.gnome.org/show_bug.cgi?id=635375
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/simple-greeter/gdm-greeter-login-window.c | 11 | ||||
| -rw-r--r-- | gui/simple-greeter/gdm-simple-greeter.schemas.in | 11 |
2 files changed, 1 insertions, 21 deletions
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c index ba8a0c53..7bd66603 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -86,7 +86,6 @@ #define KEY_GREETER_DIR "/apps/gdm/simple-greeter" #define KEY_BANNER_MESSAGE_ENABLED KEY_GREETER_DIR "/banner_message_enable" #define KEY_BANNER_MESSAGE_TEXT KEY_GREETER_DIR "/banner_message_text" -#define KEY_BANNER_MESSAGE_TEXT_NOCHOOSER KEY_GREETER_DIR "/banner_message_text_nochooser" #define KEY_LOGO KEY_GREETER_DIR "/logo_icon_name" #define KEY_DISABLE_USER_LIST "/apps/gdm/simple-greeter/disable_user_list" @@ -2070,14 +2069,6 @@ update_banner_message (GdmGreeterLoginWindow *login_window) } else { char *message = NULL; error = NULL; - if (user_chooser_has_no_user (login_window)) { - message = gconf_client_get_string (login_window->priv->client, KEY_BANNER_MESSAGE_TEXT_NOCHOOSER, &error); - if (error != NULL) { - g_debug("GdmGreeterLoginWindow: unable to get nochooser banner text: %s", error->message); - g_error_free(error); - } - } - error = NULL; if (message == NULL) { message = gconf_client_get_string (login_window->priv->client, KEY_BANNER_MESSAGE_TEXT, &error); if (error != NULL) { @@ -2261,7 +2252,7 @@ on_gconf_key_changed (GConfClient *client, g_warning ("Error retrieving configuration key '%s': Invalid type", key); } - } else if (strcmp (key, KEY_BANNER_MESSAGE_TEXT) == 0 || strcmp (key, KEY_BANNER_MESSAGE_TEXT_NOCHOOSER) == 0) { + } else if (strcmp (key, KEY_BANNER_MESSAGE_TEXT) == 0) { if (login_window->priv->banner_message_enabled) { update_banner_message (login_window); } diff --git a/gui/simple-greeter/gdm-simple-greeter.schemas.in b/gui/simple-greeter/gdm-simple-greeter.schemas.in index fe598ad1..9eb72a0c 100644 --- a/gui/simple-greeter/gdm-simple-greeter.schemas.in +++ b/gui/simple-greeter/gdm-simple-greeter.schemas.in @@ -23,17 +23,6 @@ </locale> </schema> <schema> - <key>/schemas/apps/gdm/simple-greeter/banner_message_text_nochooser</key> - <applyto>/apps/gdm/simple-greeter/banner_message_text_nochooser</applyto> - <owner>gdm-simple-greeter</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Banner message text when chooser is empty</short> - <long>Text banner message to show in the login window when the user chooser is empty, instead of banner_message_text.</long> - </locale> - </schema> - <schema> <key>/schemas/apps/gdm/simple-greeter/logo_icon_name</key> <applyto>/apps/gdm/simple-greeter/logo_icon_name</applyto> <owner>gdm-simple-greeter</owner> |