[gnome-control-center] user-accounts: Move um_get_current_language to common/
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] user-accounts: Move um_get_current_language to common/
- Date: Mon, 24 Jan 2011 18:35:41 +0000 (UTC)
commit 9229ab875e842ac2e30d6d44514eb0867c8fb3b9
Author: Bastien Nocera <hadess hadess net>
Date: Mon Jan 24 18:26:00 2011 +0000
user-accounts: Move um_get_current_language to common/
panels/common/cc-common-language.c | 4 +++-
panels/common/cc-common-language.h | 2 +-
panels/user-accounts/um-language-dialog.c | 17 +----------------
panels/user-accounts/um-user-panel.c | 4 ++--
4 files changed, 7 insertions(+), 20 deletions(-)
---
diff --git a/panels/common/cc-common-language.c b/panels/common/cc-common-language.c
index a6d13fd..7c9308a 100644
--- a/panels/common/cc-common-language.c
+++ b/panels/common/cc-common-language.c
@@ -304,9 +304,10 @@ um_add_user_languages (GtkTreeModel *model)
gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1);
#endif
}
+#endif
gchar *
-um_get_current_language (void)
+cc_common_language_get_current_language (void)
{
gchar *language;
const gchar *locale;
@@ -320,6 +321,7 @@ um_get_current_language (void)
return language;
}
+#if 0
GtkWidget *
um_language_chooser_new (void)
{
diff --git a/panels/common/cc-common-language.h b/panels/common/cc-common-language.h
index 4d16dae..2cccf87 100644
--- a/panels/common/cc-common-language.h
+++ b/panels/common/cc-common-language.h
@@ -43,7 +43,7 @@ gboolean cc_common_language_get_iter_for_language (GtkTreeModel *model,
GtkTreeIter *iter);
void cc_common_language_add_available_languages (GtkListStore *store);
gboolean cc_common_language_has_font (const gchar *locale);
-
+gchar *cc_common_language_get_current_language (void);
G_END_DECLS
diff --git a/panels/user-accounts/um-language-dialog.c b/panels/user-accounts/um-language-dialog.c
index 5c24142..f1ee69a 100644
--- a/panels/user-accounts/um-language-dialog.c
+++ b/panels/user-accounts/um-language-dialog.c
@@ -134,7 +134,7 @@ um_add_user_languages (GtkTreeModel *model)
g_slist_free (users);
/* 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)) {
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);
}
-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 *
um_language_chooser_new (void)
{
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index 40cf89e..f1c0e97 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -529,7 +529,7 @@ show_user (UmUser *user, UmUserPanelPrivate *d)
lang = g_strdup (um_user_get_language (user));
if (!lang)
- lang = um_get_current_language ();
+ 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 (widget), &iter);
g_free (lang);
@@ -627,7 +627,7 @@ language_response (GtkDialog *dialog,
else {
lang = g_strdup (um_user_get_language (user));
if (!lang)
- lang = um_get_current_language ();
+ 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]