applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

user-accounts: Move um_get_current_language to common/

Browse source
This commit is contained in:
Bastien Nocera 2011-01-24 18:26:00 +00:00
parent dd9be3f2be
commit 9229ab875e
4 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
panels/common/cc-common-language.c
View file

@ -304,9 +304,10 @@ um_add_user_languages (GtkTreeModel *model)
gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1); gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1);
#endif #endif
} }
#endif
gchar * gchar *
um_get_current_language (void) cc_common_language_get_current_language (void)
{ {
gchar *language; gchar *language;
const gchar *locale; const gchar *locale;
@ -320,6 +321,7 @@ um_get_current_language (void)
return language; return language;
} }
#if 0
GtkWidget * GtkWidget *
um_language_chooser_new (void) um_language_chooser_new (void)
{ {

2
panels/common/cc-common-language.h
View file

@ -43,7 +43,7 @@ gboolean cc_common_language_get_iter_for_language (GtkTreeModel *model,
GtkTreeIter *iter); GtkTreeIter *iter);
void cc_common_language_add_available_languages (GtkListStore *store); void cc_common_language_add_available_languages (GtkListStore *store);
gboolean cc_common_language_has_font (const gchar *locale); gboolean cc_common_language_has_font (const gchar *locale);
gchar *cc_common_language_get_current_language (void);
G_END_DECLS G_END_DECLS

17
panels/user-accounts/um-language-dialog.c
View file

@ -134,7 +134,7 @@ um_add_user_languages (GtkTreeModel *model)
g_slist_free (users); g_slist_free (users);
/* Make sure the current locale is present */ /* Make sure the current locale is present */
name = um_get_current_language (); name = cc_common_language_get_current_language ();
if (!g_hash_table_lookup (seen, name)) { if (!g_hash_table_lookup (seen, name)) {
language = gdm_get_language_from_name (name, NULL); language = gdm_get_language_from_name (name, NULL);
@ -151,21 +151,6 @@ um_add_user_languages (GtkTreeModel *model)
gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1); gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1);
} }
gchar *
um_get_current_language (void)
{
gchar *language;
const gchar *locale;
locale = (const gchar *) setlocale (LC_MESSAGES, NULL);
if (locale)
language = gdm_normalize_language_name (locale);
else
language = NULL;
return language;
}
GtkWidget * GtkWidget *
um_language_chooser_new (void) um_language_chooser_new (void)
{ {

4
panels/user-accounts/um-user-panel.c
View file

@ -529,7 +529,7 @@ show_user (UmUser *user, UmUserPanelPrivate *d)
lang = g_strdup (um_user_get_language (user)); lang = g_strdup (um_user_get_language (user));
if (!lang) if (!lang)
lang = um_get_current_language (); lang = cc_common_language_get_current_language ();
cc_common_language_get_iter_for_language (model, lang, &iter); cc_common_language_get_iter_for_language (model, lang, &iter);
um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (widget), &iter); um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (widget), &iter);
g_free (lang); g_free (lang);
@ -627,7 +627,7 @@ language_response (GtkDialog *dialog,
else { else {
lang = g_strdup (um_user_get_language (user)); lang = g_strdup (um_user_get_language (user));
if (!lang) if (!lang)
lang = um_get_current_language (); lang = cc_common_language_get_current_language ();
} }
cc_common_language_get_iter_for_language (model, lang, &iter); cc_common_language_get_iter_for_language (model, lang, &iter);
um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (combo), &iter); um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (combo), &iter);