diff options
| author | Heinz Deinhart <heinz@nix.at> | 2021-10-28 11:40:54 +0200 |
|---|---|---|
| committer | Heinz Deinhart <heinz@nix.at> | 2021-10-28 11:40:54 +0200 |
| commit | 72db404fed790cf605388db93c998a6d2aa59e8b (patch) | |
| tree | 7d0b142f85730d29d822cadd643c9636798ddb62 /src | |
| parent | 2e451cf6f4201e211ef8c9103e4222aa1c807418 (diff) | |
| download | lightdm-gtk-greeter-git-72db404fed790cf605388db93c998a6d2aa59e8b.tar.gz | |
make username trimming unconditionally by default
Diffstat (limited to 'src')
| -rw-r--r-- | src/greeterconfiguration.h | 1 | ||||
| -rw-r--r-- | src/lightdm-gtk-greeter.c | 23 |
2 files changed, 6 insertions, 18 deletions
diff --git a/src/greeterconfiguration.h b/src/greeterconfiguration.h index 1c7474a..587226d 100644 --- a/src/greeterconfiguration.h +++ b/src/greeterconfiguration.h @@ -38,7 +38,6 @@ #define CONFIG_KEY_KEYBOARD_POSITION "keyboard-position" #define CONFIG_KEY_A11Y_STATES "a11y-states" #define CONFIG_KEY_AT_SPI_ENABLED "at-spi-enabled" -#define CONFIG_KEY_USERNAME_STRIP_WS "username-strip-whitespace" #define CONFIG_GROUP_MONITOR "monitor:" #define CONFIG_KEY_BACKGROUND "background" diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c index 17a079c..2bf8775 100644 --- a/src/lightdm-gtk-greeter.c +++ b/src/lightdm-gtk-greeter.c @@ -95,7 +95,6 @@ static GtkEntry *username_entry, *password_entry; static GtkLabel *message_label; static GtkInfoBar *info_bar; static GtkButton *cancel_button, *login_button; -static gboolean username_strip_whitespace = FALSE; /* Panel */ static GtkWidget *panel_window, *menubar; @@ -2296,16 +2295,13 @@ G_MODULE_EXPORT gboolean username_focus_out_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data) { - if (username_strip_whitespace == TRUE) - { - const gchar *username = gtk_entry_get_text (username_entry); - gchar *stripped_username = g_strdup (username); + const gchar *username = gtk_entry_get_text (username_entry); + gchar *stripped_username = g_strdup (username); - g_strstrip (stripped_username); - if (g_strcmp0 (username, stripped_username) != 0) - gtk_entry_set_text (username_entry, stripped_username); - g_free (stripped_username); - } + g_strstrip (stripped_username); + if (g_strcmp0 (username, stripped_username) != 0) + gtk_entry_set_text (username_entry, stripped_username); + g_free (stripped_username); if (!g_strcmp0(gtk_entry_get_text (username_entry), "") == 0) start_authentication (gtk_entry_get_text (username_entry)); @@ -3086,13 +3082,6 @@ main (int argc, char **argv) cancel_button = GTK_BUTTON (gtk_builder_get_object (builder, "cancel_button")); login_button = GTK_BUTTON (gtk_builder_get_object (builder, "login_button")); - value = config_get_string (NULL, CONFIG_KEY_USERNAME_STRIP_WS, NULL); - if (value) - { - if (g_strcmp0 (value, "true") == 0) - username_strip_whitespace = TRUE; - } - /* Panel window*/ panel_window = GTK_WIDGET (gtk_builder_get_object (builder, "panel_window")); menubar = GTK_WIDGET (gtk_builder_get_object (builder, "menubar")); |