[gnome-initial-setup] Make language change work more than once



commit c83ed3771b0eac9bcd29f1b87071897afdc3dceb
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jun 11 23:14:14 2013 -0400

    Make language change work more than once
    
    g_permission_get_can_acquire returns FALSE if the permission has
    already been obtained.
    https://bugzilla.gnome.org/show_bug.cgi?id=701955

 .../pages/language/gis-language-page.c             |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/gnome-initial-setup/pages/language/gis-language-page.c 
b/gnome-initial-setup/pages/language/gis-language-page.c
index b6279d2..48233b4 100644
--- a/gnome-initial-setup/pages/language/gis-language-page.c
+++ b/gnome-initial-setup/pages/language/gis-language-page.c
@@ -125,13 +125,16 @@ language_changed (CcLanguageChooser  *chooser,
   setlocale (LC_MESSAGES, priv->new_locale_id);
   gis_driver_locale_changed (driver);
 
-  if (gis_driver_get_mode (driver) == GIS_DRIVER_MODE_NEW_USER &&
-      g_permission_get_can_acquire (priv->permission)) {
-
-      g_permission_acquire_async (priv->permission,
-                                  NULL,
-                                  change_locale_permission_acquired,
-                                  page);
+  if (gis_driver_get_mode (driver) == GIS_DRIVER_MODE_NEW_USER) {
+      if (g_permission_get_allowed (priv->permission)) {
+          set_localed_locale (page);
+      }
+      else if (g_permission_get_can_acquire (priv->permission)) {
+          g_permission_acquire_async (priv->permission,
+                                      NULL,
+                                      change_locale_permission_acquired,
+                                      page);
+      }
   }
   user = act_user_manager_get_user (act_user_manager_get_default (),
                                     g_get_user_name ());


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