[gdm] session: Don't accept empty string as saved language



commit 8b0fbe27f0fbaa09dfcfd0485c4ca06982c0ffe9
Author: Colin Walters <walters verbum org>
Date:   Mon Apr 29 16:49:46 2013 -0400

    session: Don't accept empty string as saved language
    
    accountsservice currently returns the empty string for Language (and
    other string keys) when they're unset, instead of NULL.  GDM should be
    defensive against this.
    
    This way we get a proper fallback to the system's default locale.
    Fixes setting of $LANG in user session in gnome-ostree buildmaster.
    
    See also:
    http://lists.freedesktop.org/archives/systemd-devel/2013-January/007945.html
    for a discussion of the current state of $LANG, pam, systemd, gdm, and
    accountsservice.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=699261

 daemon/gdm-session.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index 87bf74f..816a4b4 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -887,8 +887,8 @@ worker_on_saved_language_name_read (GdmDBusWorker          *worker,
 {
         GdmSession *self = conversation->session;
 
-        if (strcmp (language_name,
-                    get_default_language_name (self)) != 0) {
+        if (strlen (language_name) > 0 &&
+            strcmp (language_name, get_default_language_name (self)) != 0) {
                 g_free (self->priv->saved_language);
                 self->priv->saved_language = g_strdup (language_name);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]