Changeset 2364
- Timestamp:
- Sep 2, 2016, 1:29:23 PM (5 years ago)
- Location:
- lightdm-gtk-greeter/trunk/fuentes
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
lightdm-gtk-greeter/trunk/fuentes/debian/changelog
r2363 r2364 1 lightdm-gtk-greeter (2.0.1-2+lliurex2) xenial; urgency=medium 2 3 * Change language labels (fixed patch) 4 5 -- M.Angel Juan <m.angel.juan@gmail.com> Fri, 02 Sep 2016 13:28:08 +0200 6 1 7 lightdm-gtk-greeter (2.0.1-2+lliurex) xenial; urgency=medium 2 8 -
lightdm-gtk-greeter/trunk/fuentes/debian/patches/valencian_labels
r2361 r2364 24 24 Last-Update: <YYYY-MM-DD> 25 25 26 --- lightdm-gtk-greeter-2.0.1.orig/src/lightdm-gtk-greeter.c 27 +++ lightdm-gtk-greeter-2.0.1/src/lightdm-gtk-greeter.c 28 @@ -184,7 +184,7 @@ static gchar *current_language; 26 Index: fuentes/src/lightdm-gtk-greeter.c 27 =================================================================== 28 --- fuentes.orig/src/lightdm-gtk-greeter.c 29 +++ fuentes/src/lightdm-gtk-greeter.c 30 @@ -184,6 +184,7 @@ static gchar *current_language; 29 31 static gchar* get_language (void); 30 32 static void set_language (const gchar *language); 31 33 void language_selected_cb (GtkMenuItem *menuitem, gpointer user_data); 32 -33 34 +static const gchar* gchar_valencian = "Valencià"; 35 34 36 /* Screensaver values */ 35 37 static int timeout, interval, prefer_blanking, allow_exposures; 38 @@ -1003,7 +1004,7 @@ set_session (const gchar *session) 39 menu_iter = menu_items; 36 40 37 @@ -1027,14 +1027,23 @@ get_language (void) 41 if (menu_iter) 42 - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_iter->data), TRUE); 43 + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_iter->data), TRUE); 44 } 45 46 g_free (current_session); 47 @@ -1027,14 +1028,23 @@ get_language (void) 38 48 GList *menu_items, *menu_iter; 39 49 … … 42 52 - return g_strdup (current_language); 43 53 + if (current_language){ 44 + 45 + return g_strdup (current_language);46 + 47 + 54 + if(g_strcmp0(current_language,gchar_valencian)!=0) 55 + return g_strdup (current_language); 56 + else 57 + return g_strdup_printf("%s","ca_ES@valencia"); 48 58 + } 49 59 … … 54 64 - return g_strdup (g_object_get_data (G_OBJECT (menu_iter->data), LANGUAGE_DATA_CODE)); 55 65 + if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menu_iter->data))){ 56 + 66 + gchar *lang= g_object_get_data (G_OBJECT (menu_iter->data), LANGUAGE_DATA_CODE); 57 67 + if (g_strcmp0(lang,gchar_valencian)!=0) 58 + 59 + 60 + 61 + 68 + return g_strdup (lang); 69 + else 70 + return g_strdup_printf("%s","ca_ES@valencia"); 71 + } 62 72 } 63 73 64 74 return NULL; 65 @@ -1045,6 +1054,9 @@ set_language (const gchar *language) 66 { 75 @@ -1046,6 +1056,9 @@ set_language (const gchar *language) 67 76 const gchar *default_language = NULL; 68 77 GList *menu_items, *menu_iter; 69 +78 70 79 + if ( g_strcmp0(language,gchar_valencian)==0) 71 80 + language = g_strdup_printf("%s","ca_ES@valencia"); 72 81 + 73 82 if (!gtk_widget_get_visible (language_menuitem)) 74 83 { 75 @@ -1054,7 +1066,6 @@ set_language (const gchar *language) 76 } 77 78 menu_items = gtk_container_get_children (GTK_CONTAINER (language_menu)); 79 - 80 if (language) 81 { 82 for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next (menu_iter)) 83 @@ -1062,30 +1073,37 @@ set_language (const gchar *language) 84 g_free (current_language); 85 @@ -1062,6 +1075,8 @@ set_language (const gchar *language) 84 86 gchar *s; 85 87 gboolean matched; 86 88 s = g_strdup (g_object_get_data (G_OBJECT (menu_iter->data), LANGUAGE_DATA_CODE)); 87 - matched = g_strcmp0 (s, language) == 0;88 89 + if ( g_strcmp0(s,gchar_valencian)==0) 89 + 90 +matched = g_strcmp0 (s, language) == 0;90 + s = g_strdup_printf("%s","ca_ES@valencia"); 91 matched = g_strcmp0 (s, language) == 0; 91 92 g_free (s); 92 93 if (matched) 93 { 94 @@ -1069,7 +1084,11 @@ set_language (const gchar *language) 94 95 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_iter->data), TRUE); 95 96 g_free (current_language); … … 97 98 - gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem),language); 98 99 + 99 + 100 + 101 + 102 + 100 + if ( g_strcmp0(current_language,"ca_ES@valencia")==0) 101 + gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem),g_strdup_printf("%s",gchar_valencian)); 102 + else 103 + gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem),current_language); 103 104 return; 104 105 } 105 106 } 106 } 107 - 108 /* If failed to find this language, then try the default */ 107 @@ -1079,7 +1098,10 @@ set_language (const gchar *language) 109 108 if (lightdm_get_language ()) 110 109 { 111 110 default_language = lightdm_language_get_code (lightdm_get_language ()); 112 111 - gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem), default_language); 113 + 114 + 115 + 116 + 112 + if ( g_strcmp0(default_language,"ca_ES@valencia")==0) 113 + gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem), g_strdup_printf("%s",gchar_valencian)); 114 + else 115 + gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem), default_language); 117 116 } 118 117 if (default_language && g_strcmp0 (default_language, language) != 0) 119 - set_language (default_language); 120 + set_language (default_language); 121 /* If all else fails, just use the first language from the menu */ 122 else 123 - { 124 for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next (menu_iter)) 125 { 126 if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menu_iter->data))) 127 @@ -1094,7 +1112,6 @@ set_language (const gchar *language) 128 break; 129 } 130 } 131 - } 132 } 133 134 void 135 @@ -1102,8 +1119,12 @@ language_selected_cb (GtkMenuItem *menui 136 { 118 set_language (default_language); 119 @@ -1103,6 +1125,9 @@ language_selected_cb (GtkMenuItem *menui 137 120 if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem))) 138 121 { 139 - gchar *language = g_object_get_data (G_OBJECT (menuitem), LANGUAGE_DATA_CODE); 140 - set_language (language); 141 + gchar *language = g_object_get_data (G_OBJECT (menuitem), LANGUAGE_DATA_CODE); 142 + if (g_strcmp0(language,gchar_valencian) == 0){ 143 + language = g_strdup_printf("%s","ca_ES@valencia"); 144 + } 145 + set_language (language); 146 + g_free(language); 122 gchar *language = g_object_get_data (G_OBJECT (menuitem), LANGUAGE_DATA_CODE); 123 + if (g_strcmp0(language,gchar_valencian) == 0){ 124 + language = g_strdup_printf("%s","ca_ES@valencia"); 125 + } 126 set_language (language); 147 127 } 148 128 } 149 150 @@ -1941,7 +1962,6 @@ start_authentication (const gchar *usern 151 else 152 { 153 LightDMUser *user; 154 - 155 user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username); 156 if (user) 157 { 158 @@ -1958,6 +1978,7 @@ start_authentication (const gchar *usern 159 160 lightdm_greeter_authenticate (greeter, username); 161 } 162 + 163 } 164 165 static void 166 @@ -2009,12 +2030,10 @@ start_session (void) 167 { 168 gchar *language; 169 gchar *session; 170 - 171 language = get_language (); 172 if (language) 173 lightdm_greeter_set_language (greeter, language); 174 g_free (language); 175 - 176 session = get_session (); 177 178 /* Remember last choice */ 179 @@ -2885,7 +2904,6 @@ main (int argc, char **argv) 180 } 181 set_session (NULL); 182 } 183 - 184 /* Language menu */ 185 if (gtk_widget_get_visible (language_menuitem)) 186 { 187 @@ -2900,21 +2918,26 @@ main (int argc, char **argv) 188 189 country = lightdm_language_get_territory (language); 190 if (country) 191 - label = g_strdup_printf ("%s - %s", lightdm_language_get_name (language), country); 192 - else 193 + label = g_strdup_printf ("%s - %s", lightdm_language_get_name (language), country); 194 + else 195 label = g_strdup (lightdm_language_get_name (language)); 196 - 197 code = lightdm_language_get_code (language); 129 @@ -2908,12 +2933,19 @@ main (int argc, char **argv) 198 130 gchar *modifier = strchr (code, '@'); 199 131 if (modifier != NULL) 200 -{132 { 201 133 - gchar *label_new = g_strdup_printf ("%s [%s]", label, modifier+1); 202 + { 203 + gchar *label_new; 134 + gchar *label_new; 204 135 + if (g_strcmp0(modifier+1,"valencia")!=0){ 205 + 206 + 207 + 208 + 136 + label_new = g_strdup_printf ("%s [%s]", label, modifier+1); 137 + }else{ 138 + label_new = g_strdup_printf ("%s", gchar_valencian); 139 + } 209 140 g_free (label); 210 141 label = label_new; 211 142 } 212 - 213 - radiomenuitem = gtk_radio_menu_item_new_with_label (languages, label); 214 - g_object_set_data (G_OBJECT (radiomenuitem), LANGUAGE_DATA_CODE, (gpointer) code); 215 + radiomenuitem = gtk_radio_menu_item_new_with_label (languages, label); 216 + if (g_strcmp0(code,"ca_ES@valencia")==0) 217 + code = g_strdup_printf ("%s", gchar_valencian); 218 + g_object_set_data (G_OBJECT (radiomenuitem), LANGUAGE_DATA_CODE, (gpointer) code); 143 144 radiomenuitem = gtk_radio_menu_item_new_with_label (languages, label); 145 + if (g_strcmp0(code,"ca_ES@valencia")==0) 146 + code = g_strdup_printf ("%s", gchar_valencian); 147 g_object_set_data (G_OBJECT (radiomenuitem), LANGUAGE_DATA_CODE, (gpointer) code); 219 148 languages = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (radiomenuitem)); 220 149 g_signal_connect (G_OBJECT (radiomenuitem), "activate", G_CALLBACK (language_selected_cb), NULL); 221 gtk_menu_shell_append (GTK_MENU_SHELL (language_menu), radiomenuitem);222 @@ -2922,7 +2945,6 @@ main (int argc, char **argv)223 }224 set_language (NULL);225 }226 -227 /* a11y menu */228 if (gtk_widget_get_visible (a11y_menuitem))229 { -
lightdm-gtk-greeter/trunk/fuentes/src/lightdm-gtk-greeter.c
r2361 r2364 186 186 void language_selected_cb (GtkMenuItem *menuitem, gpointer user_data); 187 187 static const gchar* gchar_valencian = "Valencià"; 188 188 189 /* Screensaver values */ 189 190 static int timeout, interval, prefer_blanking, allow_exposures; … … 1004 1005 1005 1006 if (menu_iter) 1006 1007 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_iter->data), TRUE); 1007 1008 } 1008 1009 … … 1029 1030 /* if the user manually selected a language, use it */ 1030 1031 if (current_language){ 1031 1032 return g_strdup (current_language);1033 1034 1032 if(g_strcmp0(current_language,gchar_valencian)!=0) 1033 return g_strdup (current_language); 1034 else 1035 return g_strdup_printf("%s","ca_ES@valencia"); 1035 1036 } 1036 1037 … … 1039 1040 { 1040 1041 if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menu_iter->data))){ 1041 1042 gchar *lang= g_object_get_data (G_OBJECT (menu_iter->data), LANGUAGE_DATA_CODE); 1042 1043 if (g_strcmp0(lang,gchar_valencian)!=0) 1043 1044 1045 1046 1044 return g_strdup (lang); 1045 else 1046 return g_strdup_printf("%s","ca_ES@valencia"); 1047 } 1047 1048 } 1048 1049 … … 1055 1056 const gchar *default_language = NULL; 1056 1057 GList *menu_items, *menu_iter; 1057 1058 1058 1059 if ( g_strcmp0(language,gchar_valencian)==0) 1059 1060 language = g_strdup_printf("%s","ca_ES@valencia"); … … 1067 1068 1068 1069 menu_items = gtk_container_get_children (GTK_CONTAINER (language_menu)); 1070 1069 1071 if (language) 1070 1072 { … … 1075 1077 s = g_strdup (g_object_get_data (G_OBJECT (menu_iter->data), LANGUAGE_DATA_CODE)); 1076 1078 if ( g_strcmp0(s,gchar_valencian)==0) 1077 1078 1079 s = g_strdup_printf("%s","ca_ES@valencia"); 1080 matched = g_strcmp0 (s, language) == 0; 1079 1081 g_free (s); 1080 1082 if (matched) … … 1084 1086 current_language = g_strdup (language); 1085 1087 1086 1087 1088 1089 1088 if ( g_strcmp0(current_language,"ca_ES@valencia")==0) 1089 gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem),g_strdup_printf("%s",gchar_valencian)); 1090 else 1091 gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem),current_language); 1090 1092 return; 1091 1093 } 1092 1094 } 1093 1095 } 1096 1094 1097 /* If failed to find this language, then try the default */ 1095 1098 if (lightdm_get_language ()) 1096 1099 { 1097 1100 default_language = lightdm_language_get_code (lightdm_get_language ()); 1098 1099 1100 1101 1101 if ( g_strcmp0(default_language,"ca_ES@valencia")==0) 1102 gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem), g_strdup_printf("%s",gchar_valencian)); 1103 else 1104 gtk_menu_item_set_label (GTK_MENU_ITEM (language_menuitem), default_language); 1102 1105 } 1103 1106 if (default_language && g_strcmp0 (default_language, language) != 0) 1104 1107 set_language (default_language); 1105 1108 /* If all else fails, just use the first language from the menu */ 1106 1109 else 1110 { 1107 1111 for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next (menu_iter)) 1108 1112 { … … 1113 1117 } 1114 1118 } 1119 } 1115 1120 } 1116 1121 … … 1120 1125 if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem))) 1121 1126 { 1122 gchar *language = g_object_get_data (G_OBJECT (menuitem), LANGUAGE_DATA_CODE); 1123 if (g_strcmp0(language,gchar_valencian) == 0){ 1124 language = g_strdup_printf("%s","ca_ES@valencia"); 1125 } 1126 set_language (language); 1127 g_free(language); 1127 gchar *language = g_object_get_data (G_OBJECT (menuitem), LANGUAGE_DATA_CODE); 1128 if (g_strcmp0(language,gchar_valencian) == 0){ 1129 language = g_strdup_printf("%s","ca_ES@valencia"); 1130 } 1131 set_language (language); 1128 1132 } 1129 1133 } … … 1963 1967 { 1964 1968 LightDMUser *user; 1969 1965 1970 user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username); 1966 1971 if (user) … … 1979 1984 lightdm_greeter_authenticate (greeter, username); 1980 1985 } 1981 1982 1986 } 1983 1987 … … 2031 2035 gchar *language; 2032 2036 gchar *session; 2037 2033 2038 language = get_language (); 2034 2039 if (language) 2035 2040 lightdm_greeter_set_language (greeter, language); 2036 2041 g_free (language); 2042 2037 2043 session = get_session (); 2038 2044 … … 2905 2911 set_session (NULL); 2906 2912 } 2913 2907 2914 /* Language menu */ 2908 2915 if (gtk_widget_get_visible (language_menuitem)) … … 2919 2926 country = lightdm_language_get_territory (language); 2920 2927 if (country) 2921 2922 2928 label = g_strdup_printf ("%s - %s", lightdm_language_get_name (language), country); 2929 else 2923 2930 label = g_strdup (lightdm_language_get_name (language)); 2931 2924 2932 code = lightdm_language_get_code (language); 2925 2933 gchar *modifier = strchr (code, '@'); 2926 2934 if (modifier != NULL) 2927 { 2928 2935 { 2936 gchar *label_new; 2929 2937 if (g_strcmp0(modifier+1,"valencia")!=0){ 2930 2931 2932 2933 2938 label_new = g_strdup_printf ("%s [%s]", label, modifier+1); 2939 }else{ 2940 label_new = g_strdup_printf ("%s", gchar_valencian); 2941 } 2934 2942 g_free (label); 2935 2943 label = label_new; 2936 2944 } 2937 radiomenuitem = gtk_radio_menu_item_new_with_label (languages, label); 2938 if (g_strcmp0(code,"ca_ES@valencia")==0) 2939 code = g_strdup_printf ("%s", gchar_valencian); 2940 g_object_set_data (G_OBJECT (radiomenuitem), LANGUAGE_DATA_CODE, (gpointer) code); 2945 2946 radiomenuitem = gtk_radio_menu_item_new_with_label (languages, label); 2947 if (g_strcmp0(code,"ca_ES@valencia")==0) 2948 code = g_strdup_printf ("%s", gchar_valencian); 2949 g_object_set_data (G_OBJECT (radiomenuitem), LANGUAGE_DATA_CODE, (gpointer) code); 2941 2950 languages = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (radiomenuitem)); 2942 2951 g_signal_connect (G_OBJECT (radiomenuitem), "activate", G_CALLBACK (language_selected_cb), NULL); … … 2946 2955 set_language (NULL); 2947 2956 } 2957 2948 2958 /* a11y menu */ 2949 2959 if (gtk_widget_get_visible (a11y_menuitem))
Note: See TracChangeset
for help on using the changeset viewer.