summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2014-05-30 13:02:00 +0200
committerOndrej Holy <oholy@redhat.com>2014-06-12 13:14:15 +0200
commit0173b88f99e1a0356fcfa5e1cd1e568dd3dbf6cf (patch)
tree7860f1e78b1eefb4e77f473bda683f9709e8904d
parentf5b3ce5b827851055cb8447117496b1f66f7621b (diff)
downloadgnome-control-center-0173b88f99e1a0356fcfa5e1cd1e568dd3dbf6cf.tar.gz
user-accounts: fix language showing
Wrong language is shown for user with unset language if we are switching between "Other accounts" and panel is locked. https://bugzilla.gnome.org/show_bug.cgi?id=731272
-rw-r--r--panels/user-accounts/um-user-panel.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index b86d66d06..80c933cd3 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -702,8 +702,12 @@ show_user (ActUser *user, CcUserPanelPrivate *d)
lang = g_strdup (act_user_get_language (user));
if (!lang)
lang = cc_common_language_get_current_language ();
- if (cc_common_language_get_iter_for_language (model, lang, &iter))
- um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (widget), &iter);
+
+ if (cc_common_language_get_iter_for_language (model, lang, &iter)) {
+ um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (widget), &iter);
+ } else {
+ um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (widget), NULL);
+ }
g_free (lang);
/* Fingerprint: show when self, possible, and local account */