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

user-accounts: Move um_get_iter_for_language to common/

Browse source 
More sharing
This commit is contained in:
Bastien Nocera 2011-01-24 18:15:03 +00:00
parent 6a3b8be917
commit 5dd0a8c47a
5 changed files with 12 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,9 +106,8 @@ cc_common_language_sort_languages (GtkTreeModel *model,
return result; return result;
} }
#if 0
gboolean gboolean
um_get_iter_for_language (GtkTreeModel *model, cc_common_language_get_iter_for_language (GtkTreeModel *model,
const gchar *lang, const gchar *lang,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
@ -140,6 +139,7 @@ um_get_iter_for_language (GtkTreeModel *model,
return FALSE; return FALSE;
} }
#if 0
static void static void
row_activated (GtkTreeView *tree_view, row_activated (GtkTreeView *tree_view,
GtkTreePath *path, GtkTreePath *path,

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

@ -29,9 +29,6 @@ G_BEGIN_DECLS
#if 0 #if 0
void um_add_user_languages (GtkTreeModel *model); void um_add_user_languages (GtkTreeModel *model);
gchar *um_get_current_language (void); gchar *um_get_current_language (void);
gboolean um_get_iter_for_language (GtkTreeModel *model,
const gchar *lang,
GtkTreeIter *iter);
GtkWidget *um_language_chooser_new (void); GtkWidget *um_language_chooser_new (void);
gchar *um_language_chooser_get_language (GtkWidget *chooser); gchar *um_language_chooser_get_language (GtkWidget *chooser);
@ -41,6 +38,10 @@ gint cc_common_language_sort_languages (GtkTreeModel *model,
GtkTreeIter *a, GtkTreeIter *a,
GtkTreeIter *b, GtkTreeIter *b,
gpointer data); gpointer data);
gboolean cc_common_language_get_iter_for_language (GtkTreeModel *model,
const gchar *lang,
GtkTreeIter *iter);
G_END_DECLS G_END_DECLS

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

@ -78,39 +78,6 @@ um_language_chooser_get_language (GtkWidget *chooser)
return lang; return lang;
} }
gboolean
um_get_iter_for_language (GtkTreeModel *model,
const gchar *lang,
GtkTreeIter *iter)
{
char *l;
char *name;
char *language;
gtk_tree_model_get_iter_first (model, iter);
do {
gtk_tree_model_get (model, iter, LOCALE_COL, &l, -1);
if (g_strcmp0 (l, lang) == 0) {
g_free (l);
return TRUE;
}
g_free (l);
} while (gtk_tree_model_iter_next (model, iter));
name = gdm_normalize_language_name (lang);
if (name != NULL) {
language = gdm_get_language_from_name (name, NULL);
gtk_list_store_append (GTK_LIST_STORE (model), iter);
gtk_list_store_set (GTK_LIST_STORE (model), iter, LOCALE_COL, name, DISPLAY_LOCALE_COL, language, -1);
g_free (name);
g_free (language);
return TRUE;
}
return FALSE;
}
static void static void
row_activated (GtkTreeView *tree_view, row_activated (GtkTreeView *tree_view,
GtkTreePath *path, GtkTreePath *path,

3
panels/user-accounts/um-language-dialog.h
View file

@ -31,9 +31,6 @@ typedef struct _UmLanguageDialog UmLanguageDialog;
void um_add_user_languages (GtkTreeModel *model); void um_add_user_languages (GtkTreeModel *model);
gchar *um_get_current_language (void); gchar *um_get_current_language (void);
gboolean um_get_iter_for_language (GtkTreeModel *model,
const gchar *lang,
GtkTreeIter *iter);
GtkWidget *um_language_chooser_new (void); GtkWidget *um_language_chooser_new (void);
gchar *um_language_chooser_get_language (GtkWidget *chooser); gchar *um_language_chooser_get_language (GtkWidget *chooser);

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

@ -57,6 +57,8 @@
#include "um-fingerprint-dialog.h" #include "um-fingerprint-dialog.h"
#include "um-utils.h" #include "um-utils.h"
#include "cc-common-language.h"
G_DEFINE_DYNAMIC_TYPE (UmUserPanel, um_user_panel, CC_TYPE_PANEL) G_DEFINE_DYNAMIC_TYPE (UmUserPanel, um_user_panel, CC_TYPE_PANEL)
#define UM_USER_PANEL_PRIVATE(o) \ #define UM_USER_PANEL_PRIVATE(o) \
@ -528,7 +530,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 = um_get_current_language ();
um_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 +629,7 @@ language_response (GtkDialog *dialog,
if (!lang) if (!lang)
lang = um_get_current_language (); lang = um_get_current_language ();
} }
um_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);
g_free (lang); g_free (lang);