[gnome-control-center/wip/region-panel: 4/7] user: Adapt to new language chooser



commit 3adc08ba4c00ae19df8a2581f41f0bd6aed3a016
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Jan 27 23:16:40 2013 -0500

    user: Adapt to new language chooser

 panels/user-accounts/um-user-panel.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index 224274f..42d8ac6 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -766,13 +766,14 @@ language_response (GtkDialog         *dialog,
         model = um_editable_combo_get_model (UM_EDITABLE_COMBO (combo));
 
         if (response_id == GTK_RESPONSE_OK) {
-                lang = cc_language_chooser_get_language (GTK_WIDGET (dialog));
+                lang = g_strdup (cc_language_chooser_get_language (GTK_WIDGET (dialog)));
                 act_user_set_language (user, lang);
         }
         else {
-                lang = g_strdup (act_user_get_language (user));
-                if (!lang)
+                lang = act_user_get_language (user);
+                if (!lang) {
                         lang = cc_common_language_get_current_language ();
+                }
         }
         cc_common_language_get_iter_for_language (model, lang, &iter);
         um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (combo), &iter);
@@ -816,7 +817,7 @@ language_changed (UmEditableCombo    *combo,
                 goto out;
         }
 
-        d->language_chooser = cc_language_chooser_new (gtk_widget_get_toplevel (d->main_box), FALSE);
+        d->language_chooser = cc_language_chooser_new (gtk_widget_get_toplevel (d->main_box));
 
         g_signal_connect (d->language_chooser, "response",
                           G_CALLBACK (language_response), d);



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