Changeset 2857 for lightdm-gtk-greeter

Timestamp:

Nov 14, 2016, 6:27:38 PM (3 years ago)

Author:

mabarracus

Message:

Add default language option to use pam_environment sessions settings

Location:

lightdm-gtk-greeter/trunk/fuentes

Files:

• debian/patches/series (modified) (1 diff)
• debian/patches/test_default (added)
• debian/patches/trad_cad_test_default (added)
• src/lightdm-gtk-greeter.c (modified) (12 diffs)

lightdm-gtk-greeter/trunk/fuentes/debian/patches/series

@@ -1 +1 @@
 clean-up-atspi.patch
 valencian_labels
+test_default
+trad_cad_test_default

lightdm-gtk-greeter/trunk/fuentes/src/lightdm-gtk-greeter.c

@@ -185 +185 @@
 static void set_language (const gchar *language);
 void language_selected_cb (GtkMenuItem *menuitem, gpointer user_data);
-static const gchar* gchar_valencian = "Valencià";
 
 /* Screensaver values */
@@ -1005 +1004 @@
 
         if (menu_iter)
-            gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_iter->data), TRUE);
+                gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_iter->data), TRUE);
     }
 
@@ -1029 +1028 @@
 
     /* if the user manually selected a language, use it */
-    if (current_language){
-        if(g_strcmp0(current_language,gchar_valencian)!=0)
-            return g_strdup (current_language);
-        else
-            return g_strdup_printf("%s","ca_ES@valencia");
-    }
+    if (current_language)
+        return g_strdup (current_language);
 
     menu_items = gtk_container_get_children (GTK_CONTAINER (language_menu));
     for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next (menu_iter))
     {
-        if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menu_iter->data))){
-            gchar *lang= g_object_get_data (G_OBJECT (menu_iter->data), LANGUAGE_DATA_CODE);
-            if (g_strcmp0(lang,gchar_valencian)!=0)
-                return g_strdup (lang);
-            else
-                return g_strdup_printf("%s","ca_ES@valencia");
-        }
+        if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menu_iter->data)))
+            return g_strdup (g_object_get_data (G_OBJECT (menu_iter->data), LANGUAGE_DATA_CODE));
     }
 
@@ -1056 +1046 @@
     const gchar *default_language = NULL;
     GList *menu_items, *menu_iter;
-
-    if ( g_strcmp0(language,gchar_valencian)==0)
-        language = g_strdup_printf("%s","ca_ES@valencia");
 
     if (!gtk_widget_get_visible (language_menuitem))
@@ -1076 +1063 @@
             gboolean matched;
             s = g_strdup (g_object_get_data (G_OBJECT (menu_iter->data), LANGUAGE_DATA_CODE));
-            if ( g_strcmp0(s,gchar_valencian)==0)
-                s = g_strdup_printf("%s","ca_ES@valencia");
             matched = g_strcmp0 (s, language) == 0;
             g_free (s);
@@ -1085 +1070 @@
                 g_free (current_language);
                 current_language = g_strdup (language);
-
-                if ( g_strcmp0(current_language,"ca_ES@valencia")==0)
-                    gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem),g_strdup_printf("%s",gchar_valencian));
-                else
-                    gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem),current_language);
+                gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem),language);
                 return;
             }
@@ -1099 +1080 @@
     {
         default_language = lightdm_language_get_code (lightdm_get_language ());
-        if ( g_strcmp0(default_language,"ca_ES@valencia")==0)
-            gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem), g_strdup_printf("%s",gchar_valencian));
-        else
-            gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem), default_language);
+        gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem), default_language);
     }
     if (default_language && g_strcmp0 (default_language, language) != 0)
@@ -1126 +1104 @@
     {
        gchar *language = g_object_get_data (G_OBJECT (menuitem), LANGUAGE_DATA_CODE);
-       if (g_strcmp0(language,gchar_valencian) == 0){
-            language = g_strdup_printf("%s","ca_ES@valencia");
-       }
        set_language (language);
     }
@@ -2640 +2615 @@
 
     /* LP: #1366534 */
-    #ifdef AT_SPI_COMMAND
-    spawn_line_pid (AT_SPI_COMMAND, G_SPAWN_SEARCH_PATH, NULL);
-    #else
     g_setenv ("NO_AT_BRIDGE", "1", TRUE);
-    #endif
 
     /* Initialize i18n */
@@ -2772 +2743 @@
         g_free (value);
     }
+
+    #ifdef AT_SPI_COMMAND
+    spawn_line_pid (AT_SPI_COMMAND, G_SPAWN_SEARCH_PATH, NULL);
+    #endif
 
     #ifdef INDICATOR_SERVICES_COMMAND
@@ -2934 +2909 @@
             if (modifier != NULL)
             {
-                gchar *label_new;
-                if (g_strcmp0(modifier+1,"valencia")!=0){
-                    label_new = g_strdup_printf ("%s [%s]", label, modifier+1);
-                }else{
-                    label_new = g_strdup_printf ("%s", gchar_valencian);
-                }
+                gchar *label_new = g_strdup_printf ("%s [%s]", label, modifier+1);
                 g_free (label);
                 label = label_new;
@@ -2945 +2915 @@
 
             radiomenuitem = gtk_radio_menu_item_new_with_label (languages, label);
-            if (g_strcmp0(code,"ca_ES@valencia")==0)
-                code = g_strdup_printf ("%s", gchar_valencian);
             g_object_set_data (G_OBJECT (radiomenuitem), LANGUAGE_DATA_CODE, (gpointer) code);
             languages = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (radiomenuitem));