[gnome-initial-setup] language: Reindent and reformat cc-language-chooser to g-c-c guidelines
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup] language: Reindent and reformat cc-language-chooser to g-c-c guidelines
- Date: Fri, 15 Mar 2013 22:34:25 +0000 (UTC)
commit 43aa2f747cd347420b99d6e2111b6790c21d6180
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Mar 15 18:32:43 2013 -0400
language: Reindent and reformat cc-language-chooser to g-c-c guidelines
This should just be a whitespace change with no functional changes.
.../pages/language/cc-language-chooser.c | 598 ++++++++++----------
.../pages/language/cc-language-chooser.h | 12 +-
2 files changed, 304 insertions(+), 306 deletions(-)
---
diff --git a/gnome-initial-setup/pages/language/cc-language-chooser.c
b/gnome-initial-setup/pages/language/cc-language-chooser.c
index cd65ff8..779b988 100644
--- a/gnome-initial-setup/pages/language/cc-language-chooser.c
+++ b/gnome-initial-setup/pages/language/cc-language-chooser.c
@@ -1,5 +1,5 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
* Copyright (C) 2013 Red Hat
*
* This program is free software; you can redistribute it and/or
@@ -46,138 +46,138 @@ G_DEFINE_TYPE (CcLanguageChooser, cc_language_chooser, GTK_TYPE_BIN);
#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_LANGUAGE_CHOOSER,
CcLanguageChooserPrivate))
enum {
- PROP_0,
- PROP_LANGUAGE,
- PROP_SHOWING_EXTRA,
- PROP_LAST,
+ PROP_0,
+ PROP_LANGUAGE,
+ PROP_SHOWING_EXTRA,
+ PROP_LAST,
};
static GParamSpec *obj_props[PROP_LAST];
struct _CcLanguageChooserPrivate
{
- GtkWidget *no_results;
- GtkWidget *more_item;
- GtkWidget *chooser;
- GtkWidget *filter_entry;
- GtkWidget *language_list;
- gboolean showing_extra;
- gchar **filter_words;
- gchar *language;
+ GtkWidget *no_results;
+ GtkWidget *more_item;
+ GtkWidget *chooser;
+ GtkWidget *filter_entry;
+ GtkWidget *language_list;
+ gboolean showing_extra;
+ gchar **filter_words;
+ gchar *language;
};
typedef struct {
- GtkWidget *box;
- GtkWidget *checkmark;
-
- gchar *locale_id;
- gchar *locale_name;
- gchar *locale_current_name;
- gchar *locale_untranslated_name;
- gboolean is_extra;
+ GtkWidget *box;
+ GtkWidget *checkmark;
+
+ gchar *locale_id;
+ gchar *locale_name;
+ gchar *locale_current_name;
+ gchar *locale_untranslated_name;
+ gboolean is_extra;
} LanguageWidget;
static LanguageWidget *
get_language_widget (GtkWidget *widget)
{
- return g_object_get_data (G_OBJECT (widget), "language-widget");
+ return g_object_get_data (G_OBJECT (widget), "language-widget");
}
static GtkWidget *
padded_label_new (char *text)
{
- GtkWidget *widget;
- widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
- gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
- gtk_widget_set_margin_top (widget, 10);
- gtk_widget_set_margin_bottom (widget, 10);
- gtk_box_pack_start (GTK_BOX (widget), gtk_label_new (text), FALSE, FALSE, 0);
- gtk_widget_show_all (widget);
- return widget;
+ GtkWidget *widget;
+ widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+ gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+ gtk_widget_set_margin_top (widget, 10);
+ gtk_widget_set_margin_bottom (widget, 10);
+ gtk_box_pack_start (GTK_BOX (widget), gtk_label_new (text), FALSE, FALSE, 0);
+ gtk_widget_show_all (widget);
+ return widget;
}
static void
language_widget_free (gpointer data)
{
- LanguageWidget *widget = data;
-
- /* This is called when the box is destroyed,
- * so don't bother destroying the widget and
- * children again. */
- g_free (widget->locale_id);
- g_free (widget->locale_name);
- g_free (widget->locale_current_name);
- g_free (widget->locale_untranslated_name);
- g_free (widget);
+ LanguageWidget *widget = data;
+
+ /* This is called when the box is destroyed,
+ * so don't bother destroying the widget and
+ * children again. */
+ g_free (widget->locale_id);
+ g_free (widget->locale_name);
+ g_free (widget->locale_current_name);
+ g_free (widget->locale_untranslated_name);
+ g_free (widget);
}
static GtkWidget *
language_widget_new (const char *locale_id,
gboolean is_extra)
{
- gchar *locale_name, *locale_current_name, *locale_untranslated_name;
- LanguageWidget *widget = g_new0 (LanguageWidget, 1);
+ gchar *locale_name, *locale_current_name, *locale_untranslated_name;
+ LanguageWidget *widget = g_new0 (LanguageWidget, 1);
- locale_name = gnome_get_language_from_locale (locale_id, locale_id);
- locale_current_name = gnome_get_language_from_locale (locale_id, NULL);
- locale_untranslated_name = gnome_get_language_from_locale (locale_id, "C");
+ locale_name = gnome_get_language_from_locale (locale_id, locale_id);
+ locale_current_name = gnome_get_language_from_locale (locale_id, NULL);
+ locale_untranslated_name = gnome_get_language_from_locale (locale_id, "C");
- widget->box = padded_label_new (locale_name);
- widget->locale_id = g_strdup (locale_id);
- widget->locale_name = locale_name;
- widget->locale_current_name = locale_current_name;
- widget->locale_untranslated_name = locale_untranslated_name;
- widget->is_extra = is_extra;
+ widget->box = padded_label_new (locale_name);
+ widget->locale_id = g_strdup (locale_id);
+ widget->locale_name = locale_name;
+ widget->locale_current_name = locale_current_name;
+ widget->locale_untranslated_name = locale_untranslated_name;
+ widget->is_extra = is_extra;
- widget->checkmark = gtk_image_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_MENU);
- gtk_box_pack_start (GTK_BOX (widget->box), widget->checkmark,
- FALSE, FALSE, 0);
+ widget->checkmark = gtk_image_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_MENU);
+ gtk_box_pack_start (GTK_BOX (widget->box), widget->checkmark,
+ FALSE, FALSE, 0);
- g_object_set_data_full (G_OBJECT (widget->box), "language-widget", widget,
- language_widget_free);
+ g_object_set_data_full (G_OBJECT (widget->box), "language-widget", widget,
+ language_widget_free);
- return widget->box;
+ return widget->box;
}
static void
sync_checkmark (GtkWidget *child,
gpointer user_data)
{
- LanguageWidget *widget = get_language_widget (child);
- gchar *locale_id;
- gboolean should_be_visible;
+ LanguageWidget *widget = get_language_widget (child);
+ gchar *locale_id;
+ gboolean should_be_visible;
- if (widget == NULL)
- return;
+ if (widget == NULL)
+ return;
- locale_id = user_data;
- should_be_visible = g_str_equal (widget->locale_id, locale_id);
- gtk_widget_set_visible (widget->checkmark, should_be_visible);
+ locale_id = user_data;
+ should_be_visible = g_str_equal (widget->locale_id, locale_id);
+ gtk_widget_set_visible (widget->checkmark, should_be_visible);
}
static void
sync_all_checkmarks (CcLanguageChooser *chooser)
{
- CcLanguageChooserPrivate *priv = chooser->priv;
+ CcLanguageChooserPrivate *priv = chooser->priv;
- gtk_container_foreach (GTK_CONTAINER (priv->language_list),
- sync_checkmark, priv->language);
+ gtk_container_foreach (GTK_CONTAINER (priv->language_list),
+ sync_checkmark, priv->language);
}
static GtkWidget *
more_widget_new (void)
{
- GtkWidget *widget = padded_label_new ("…");
- gtk_widget_set_tooltip_text (widget, _("More…"));
- return widget;
+ GtkWidget *widget = padded_label_new ("…");
+ gtk_widget_set_tooltip_text (widget, _("More…"));
+ return widget;
}
static GtkWidget *
no_results_widget_new (void)
{
- GtkWidget *widget = padded_label_new (_("No languages found"));
- gtk_widget_set_sensitive (widget, FALSE);
- return widget;
+ GtkWidget *widget = padded_label_new (_("No languages found"));
+ gtk_widget_set_sensitive (widget, FALSE);
+ return widget;
}
static void
@@ -185,110 +185,110 @@ add_languages (CcLanguageChooser *chooser,
char **locale_ids,
GHashTable *initial)
{
- CcLanguageChooserPrivate *priv = chooser->priv;
+ CcLanguageChooserPrivate *priv = chooser->priv;
- while (*locale_ids) {
- const gchar *locale_id;
- gboolean is_extra;
- GtkWidget *widget;
+ while (*locale_ids) {
+ const gchar *locale_id;
+ gboolean is_extra;
+ GtkWidget *widget;
- locale_id = *locale_ids;
+ locale_id = *locale_ids;
- locale_ids ++;
+ locale_ids ++;
- if (!cc_common_language_has_font (locale_id))
- continue;
+ if (!cc_common_language_has_font (locale_id))
+ continue;
- is_extra = (g_hash_table_lookup (initial, locale_id) != NULL);
+ is_extra = (g_hash_table_lookup (initial, locale_id) != NULL);
- widget = language_widget_new (locale_id, is_extra);
+ widget = language_widget_new (locale_id, is_extra);
- gtk_container_add (GTK_CONTAINER (priv->language_list),
- widget);
- }
+ gtk_container_add (GTK_CONTAINER (priv->language_list),
+ widget);
+ }
- gtk_container_add (GTK_CONTAINER (priv->language_list),
- priv->more_item);
- gtk_container_add (GTK_CONTAINER (priv->language_list),
- priv->no_results);
+ gtk_container_add (GTK_CONTAINER (priv->language_list),
+ priv->more_item);
+ gtk_container_add (GTK_CONTAINER (priv->language_list),
+ priv->no_results);
- gtk_widget_show (priv->language_list);
+ gtk_widget_show (priv->language_list);
}
static void
add_all_languages (CcLanguageChooser *chooser)
{
- char **locale_ids = gnome_get_all_locales ();
- GHashTable *initial = cc_common_language_get_initial_languages ();
+ char **locale_ids = gnome_get_all_locales ();
+ GHashTable *initial = cc_common_language_get_initial_languages ();
- add_languages (chooser, locale_ids, initial);
+ add_languages (chooser, locale_ids, initial);
- g_hash_table_destroy (initial);
- g_strfreev (locale_ids);
+ g_hash_table_destroy (initial);
+ g_strfreev (locale_ids);
}
static gboolean
match_all (gchar **words,
const gchar *str)
{
- gchar **w;
+ gchar **w;
- for (w = words; *w; ++w)
- if (!strstr (str, *w))
- return FALSE;
+ for (w = words; *w; ++w)
+ if (!strstr (str, *w))
+ return FALSE;
- return TRUE;
+ return TRUE;
}
static gboolean
language_visible (GtkWidget *child,
gpointer user_data)
{
- CcLanguageChooser *chooser = user_data;
- CcLanguageChooserPrivate *priv = chooser->priv;
- gchar *locale_name = NULL;
- gchar *locale_current_name = NULL;
- gchar *locale_untranslated_name = NULL;
- LanguageWidget *widget;
- gboolean visible;
+ CcLanguageChooser *chooser = user_data;
+ CcLanguageChooserPrivate *priv = chooser->priv;
+ gchar *locale_name = NULL;
+ gchar *locale_current_name = NULL;
+ gchar *locale_untranslated_name = NULL;
+ LanguageWidget *widget;
+ gboolean visible;
- if (child == priv->more_item)
- return !priv->showing_extra;
+ if (child == priv->more_item)
+ return !priv->showing_extra;
- /* We hide this in the after-refilter handler below. */
- if (child == priv->no_results)
- return TRUE;
+ /* We hide this in the after-refilter handler below. */
+ if (child == priv->no_results)
+ return TRUE;
- widget = get_language_widget (child);
+ widget = get_language_widget (child);
- if (!priv->showing_extra && !widget->is_extra)
- return FALSE;
+ if (!priv->showing_extra && !widget->is_extra)
+ return FALSE;
- if (!priv->filter_words)
- return TRUE;
+ if (!priv->filter_words)
+ return TRUE;
- visible = FALSE;
+ visible = FALSE;
- locale_name = cc_util_normalize_casefold_and_unaccent (widget->locale_name);
- visible = match_all (priv->filter_words, locale_name);
- if (visible)
- goto out;
+ locale_name = cc_util_normalize_casefold_and_unaccent (widget->locale_name);
+ visible = match_all (priv->filter_words, locale_name);
+ if (visible)
+ goto out;
- locale_current_name = cc_util_normalize_casefold_and_unaccent (widget->locale_current_name);
- visible = match_all (priv->filter_words, locale_current_name);
- if (visible)
- goto out;
+ locale_current_name = cc_util_normalize_casefold_and_unaccent (widget->locale_current_name);
+ visible = match_all (priv->filter_words, locale_current_name);
+ if (visible)
+ goto out;
- locale_untranslated_name = cc_util_normalize_casefold_and_unaccent (widget->locale_untranslated_name);
- visible = match_all (priv->filter_words, locale_untranslated_name);
- if (visible)
- goto out;
+ locale_untranslated_name = cc_util_normalize_casefold_and_unaccent
(widget->locale_untranslated_name);
+ visible = match_all (priv->filter_words, locale_untranslated_name);
+ if (visible)
+ goto out;
out:
- g_free (locale_untranslated_name);
- g_free (locale_current_name);
- g_free (locale_name);
- return visible;
+ g_free (locale_untranslated_name);
+ g_free (locale_current_name);
+ g_free (locale_name);
+ return visible;
}
static gint
@@ -296,68 +296,68 @@ sort_languages (gconstpointer a,
gconstpointer b,
gpointer data)
{
- LanguageWidget *la, *lb;
+ LanguageWidget *la, *lb;
- la = get_language_widget (GTK_WIDGET (a));
- lb = get_language_widget (GTK_WIDGET (b));
+ la = get_language_widget (GTK_WIDGET (a));
+ lb = get_language_widget (GTK_WIDGET (b));
- if (la == NULL)
- return 1;
+ if (la == NULL)
+ return 1;
- if (lb == NULL)
- return -1;
+ if (lb == NULL)
+ return -1;
- return strcmp (la->locale_name, lb->locale_name);
+ return strcmp (la->locale_name, lb->locale_name);
}
static void
filter_changed (GtkEntry *entry,
CcLanguageChooser *chooser)
{
- CcLanguageChooserPrivate *priv = chooser->priv;
- gchar *filter_contents = NULL;
-
- g_clear_pointer (&priv->filter_words, g_strfreev);
-
- filter_contents =
- cc_util_normalize_casefold_and_unaccent (gtk_entry_get_text (GTK_ENTRY (priv->filter_entry)));
- if (!filter_contents) {
- egg_list_box_refilter (EGG_LIST_BOX (priv->language_list));
- return;
- }
- priv->filter_words = g_strsplit_set (g_strstrip (filter_contents), " ", 0);
- g_free (filter_contents);
- egg_list_box_refilter (EGG_LIST_BOX (priv->language_list));
+ CcLanguageChooserPrivate *priv = chooser->priv;
+ gchar *filter_contents = NULL;
+
+ g_clear_pointer (&priv->filter_words, g_strfreev);
+
+ filter_contents =
+ cc_util_normalize_casefold_and_unaccent (gtk_entry_get_text (GTK_ENTRY
(priv->filter_entry)));
+ if (!filter_contents) {
+ egg_list_box_refilter (EGG_LIST_BOX (priv->language_list));
+ return;
+ }
+ priv->filter_words = g_strsplit_set (g_strstrip (filter_contents), " ", 0);
+ g_free (filter_contents);
+ egg_list_box_refilter (EGG_LIST_BOX (priv->language_list));
}
static void
show_more (CcLanguageChooser *chooser)
{
- CcLanguageChooserPrivate *priv = chooser->priv;
+ CcLanguageChooserPrivate *priv = chooser->priv;
- gtk_widget_show (priv->filter_entry);
- gtk_widget_grab_focus (priv->filter_entry);
+ gtk_widget_show (priv->filter_entry);
+ gtk_widget_grab_focus (priv->filter_entry);
- priv->showing_extra = TRUE;
- egg_list_box_refilter (EGG_LIST_BOX (priv->language_list));
- g_object_notify_by_pspec (G_OBJECT (chooser), obj_props[PROP_SHOWING_EXTRA]);
+ priv->showing_extra = TRUE;
+ egg_list_box_refilter (EGG_LIST_BOX (priv->language_list));
+ g_object_notify_by_pspec (G_OBJECT (chooser), obj_props[PROP_SHOWING_EXTRA]);
}
static void
set_locale_id (CcLanguageChooser *chooser,
const gchar *new_locale_id)
{
- CcLanguageChooserPrivate *priv = chooser->priv;
+ CcLanguageChooserPrivate *priv = chooser->priv;
- if (g_strcmp0 (priv->language, new_locale_id) == 0)
- return;
+ if (g_strcmp0 (priv->language, new_locale_id) == 0)
+ return;
- g_free (priv->language);
- priv->language = g_strdup (new_locale_id);
+ g_free (priv->language);
+ priv->language = g_strdup (new_locale_id);
- sync_all_checkmarks (chooser);
+ sync_all_checkmarks (chooser);
- g_object_notify_by_pspec (G_OBJECT (chooser), obj_props[PROP_LANGUAGE]);
+ g_object_notify_by_pspec (G_OBJECT (chooser), obj_props[PROP_LANGUAGE]);
}
static void
@@ -365,50 +365,50 @@ child_activated (EggListBox *box,
GtkWidget *child,
CcLanguageChooser *chooser)
{
- if (child == NULL)
- return;
- else if (child == chooser->priv->no_results)
- return;
- else if (child == chooser->priv->more_item)
- show_more (chooser);
- else
- {
- LanguageWidget *widget = get_language_widget (child);
- set_locale_id (chooser, widget->locale_id);
- }
+ if (child == NULL)
+ return;
+ else if (child == chooser->priv->no_results)
+ return;
+ else if (child == chooser->priv->more_item)
+ show_more (chooser);
+ else
+ {
+ LanguageWidget *widget = get_language_widget (child);
+ set_locale_id (chooser, widget->locale_id);
+ }
}
typedef struct {
- gint count;
- GtkWidget *ignore;
+ gint count;
+ GtkWidget *ignore;
} CountChildrenData;
static void
count_visible_children (GtkWidget *widget,
gpointer user_data)
{
- CountChildrenData *data = user_data;
- if (widget != data->ignore &&
- gtk_widget_get_child_visible (widget) &&
- gtk_widget_get_visible (widget))
- data->count++;
+ CountChildrenData *data = user_data;
+ if (widget != data->ignore &&
+ gtk_widget_get_child_visible (widget) &&
+ gtk_widget_get_visible (widget))
+ data->count++;
}
static void
end_refilter (EggListBox *list_box,
gpointer user_data)
{
- CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (user_data);
- CcLanguageChooserPrivate *priv = chooser->priv;
+ CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (user_data);
+ CcLanguageChooserPrivate *priv = chooser->priv;
- CountChildrenData data = { 0 };
+ CountChildrenData data = { 0 };
- data.ignore = priv->no_results;
+ data.ignore = priv->no_results;
- gtk_container_foreach (GTK_CONTAINER (list_box),
- count_visible_children, &data);
+ gtk_container_foreach (GTK_CONTAINER (list_box),
+ count_visible_children, &data);
- gtk_widget_set_visible (priv->no_results, (data.count == 0));
+ gtk_widget_set_visible (priv->no_results, (data.count == 0));
}
static void
@@ -417,15 +417,15 @@ update_separator_func (GtkWidget **separator,
GtkWidget *before,
gpointer user_data)
{
- if (before == NULL)
- return;
-
- if (*separator == NULL)
- {
- *separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- g_object_ref_sink (*separator);
- gtk_widget_show (*separator);
- }
+ if (before == NULL)
+ return;
+
+ if (*separator == NULL)
+ {
+ *separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+ g_object_ref_sink (*separator);
+ gtk_widget_show (*separator);
+ }
}
#define WID(name) ((GtkWidget *) gtk_builder_get_object (builder, name))
@@ -433,161 +433,159 @@ update_separator_func (GtkWidget **separator,
static void
cc_language_chooser_constructed (GObject *object)
{
- GtkBuilder *builder;
- CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
- CcLanguageChooserPrivate *priv = chooser->priv;
- GError *error = NULL;
+ GtkBuilder *builder;
+ CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
+ CcLanguageChooserPrivate *priv = chooser->priv;
+ GError *error = NULL;
- G_OBJECT_CLASS (cc_language_chooser_parent_class)->constructed (object);
+ G_OBJECT_CLASS (cc_language_chooser_parent_class)->constructed (object);
- builder = gtk_builder_new ();
- if (gtk_builder_add_from_resource (builder, "/org/gnome/control-center/language-chooser.ui", &error) == 0)
{
- g_object_unref (builder);
- g_warning ("failed to load language chooser: %s", error->message);
- g_error_free (error);
- return;
- }
+ builder = gtk_builder_new ();
+ if (gtk_builder_add_from_resource (builder, "/org/gnome/control-center/language-chooser.ui", &error)
== 0) {
+ g_object_unref (builder);
+ g_warning ("failed to load language chooser: %s", error->message);
+ g_error_free (error);
+ return;
+ }
- gtk_container_add (GTK_CONTAINER (chooser), WID ("language-chooser"));
+ gtk_container_add (GTK_CONTAINER (chooser), WID ("language-chooser"));
- priv->filter_entry = WID ("language-filter-entry");
- priv->language_list = WID ("language-list");
- priv->more_item = more_widget_new ();
- priv->no_results = no_results_widget_new ();
+ priv->filter_entry = WID ("language-filter-entry");
+ priv->language_list = WID ("language-list");
+ priv->more_item = more_widget_new ();
+ priv->no_results = no_results_widget_new ();
- egg_list_box_set_adjustment (EGG_LIST_BOX (priv->language_list),
- gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (WID
("language-scrolledwindow"))));
+ egg_list_box_set_adjustment (EGG_LIST_BOX (priv->language_list),
+ gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (WID
("language-scrolledwindow"))));
- egg_list_box_set_sort_func (EGG_LIST_BOX (priv->language_list),
- sort_languages, chooser, NULL);
- egg_list_box_set_filter_func (EGG_LIST_BOX (priv->language_list),
- language_visible, chooser, NULL);
- egg_list_box_set_separator_funcs (EGG_LIST_BOX (priv->language_list),
- update_separator_func, chooser, NULL);
+ egg_list_box_set_sort_func (EGG_LIST_BOX (priv->language_list),
+ sort_languages, chooser, NULL);
+ egg_list_box_set_filter_func (EGG_LIST_BOX (priv->language_list),
+ language_visible, chooser, NULL);
+ egg_list_box_set_separator_funcs (EGG_LIST_BOX (priv->language_list),
+ update_separator_func, chooser, NULL);
- egg_list_box_set_selection_mode (EGG_LIST_BOX (priv->language_list),
- GTK_SELECTION_NONE);
- add_all_languages (chooser);
+ egg_list_box_set_selection_mode (EGG_LIST_BOX (priv->language_list),
+ GTK_SELECTION_NONE);
+ add_all_languages (chooser);
- g_signal_connect (priv->filter_entry, "changed",
- G_CALLBACK (filter_changed),
- chooser);
+ g_signal_connect (priv->filter_entry, "changed",
+ G_CALLBACK (filter_changed),
+ chooser);
- g_signal_connect (priv->language_list, "child-activated",
- G_CALLBACK (child_activated), chooser);
+ g_signal_connect (priv->language_list, "child-activated",
+ G_CALLBACK (child_activated), chooser);
- g_signal_connect_after (priv->language_list, "refilter",
- G_CALLBACK (end_refilter), chooser);
+ g_signal_connect_after (priv->language_list, "refilter",
+ G_CALLBACK (end_refilter), chooser);
- egg_list_box_refilter (EGG_LIST_BOX (priv->language_list));
+ egg_list_box_refilter (EGG_LIST_BOX (priv->language_list));
- if (priv->language == NULL)
- priv->language = cc_common_language_get_current_language ();
+ if (priv->language == NULL)
+ priv->language = cc_common_language_get_current_language ();
- sync_all_checkmarks (chooser);
+ sync_all_checkmarks (chooser);
}
static void
cc_language_chooser_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
- switch (prop_id)
- {
- case PROP_LANGUAGE:
- g_value_set_string (value, cc_language_chooser_get_language (chooser));
- break;
- case PROP_SHOWING_EXTRA:
- g_value_set_boolean (value, cc_language_chooser_get_showing_extra (chooser));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
+ CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
+ switch (prop_id) {
+ case PROP_LANGUAGE:
+ g_value_set_string (value, cc_language_chooser_get_language (chooser));
+ break;
+ case PROP_SHOWING_EXTRA:
+ g_value_set_boolean (value, cc_language_chooser_get_showing_extra (chooser));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
}
static void
cc_language_chooser_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
- switch (prop_id)
- {
- case PROP_LANGUAGE:
- cc_language_chooser_set_language (chooser, g_value_get_string (value));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
+ CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
+ switch (prop_id) {
+ case PROP_LANGUAGE:
+ cc_language_chooser_set_language (chooser, g_value_get_string (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
}
static void
cc_language_chooser_finalize (GObject *object)
{
- CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
- CcLanguageChooserPrivate *priv = chooser->priv;
+ CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
+ CcLanguageChooserPrivate *priv = chooser->priv;
- g_strfreev (priv->filter_words);
+ g_strfreev (priv->filter_words);
}
static void
cc_language_chooser_class_init (CcLanguageChooserClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (object_class, sizeof(CcLanguageChooserPrivate));
+ g_type_class_add_private (object_class, sizeof(CcLanguageChooserPrivate));
- object_class->get_property = cc_language_chooser_get_property;
- object_class->set_property = cc_language_chooser_set_property;
- object_class->finalize = cc_language_chooser_finalize;
- object_class->constructed = cc_language_chooser_constructed;
+ object_class->get_property = cc_language_chooser_get_property;
+ object_class->set_property = cc_language_chooser_set_property;
+ object_class->finalize = cc_language_chooser_finalize;
+ object_class->constructed = cc_language_chooser_constructed;
- obj_props[PROP_LANGUAGE] =
- g_param_spec_string ("language", "", "", "",
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ obj_props[PROP_LANGUAGE] =
+ g_param_spec_string ("language", "", "", "",
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
- obj_props[PROP_SHOWING_EXTRA] =
- g_param_spec_string ("showing-extra", "", "", "",
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ obj_props[PROP_SHOWING_EXTRA] =
+ g_param_spec_string ("showing-extra", "", "", "",
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
- g_object_class_install_properties (object_class, PROP_LAST, obj_props);
+ g_object_class_install_properties (object_class, PROP_LAST, obj_props);
}
void
cc_language_chooser_init (CcLanguageChooser *chooser)
{
- chooser->priv = GET_PRIVATE (chooser);
+ chooser->priv = GET_PRIVATE (chooser);
}
void
cc_language_chooser_clear_filter (CcLanguageChooser *chooser)
{
- CcLanguageChooserPrivate *priv = chooser->priv;
- gtk_entry_set_text (GTK_ENTRY (priv->filter_entry), "");
+ CcLanguageChooserPrivate *priv = chooser->priv;
+ gtk_entry_set_text (GTK_ENTRY (priv->filter_entry), "");
}
const gchar *
cc_language_chooser_get_language (CcLanguageChooser *chooser)
{
- CcLanguageChooserPrivate *priv = chooser->priv;
- return priv->language;
+ CcLanguageChooserPrivate *priv = chooser->priv;
+ return priv->language;
}
void
cc_language_chooser_set_language (CcLanguageChooser *chooser,
- const gchar *language)
+ const gchar *language)
{
- set_locale_id (chooser, language);
+ set_locale_id (chooser, language);
}
gboolean
cc_language_chooser_get_showing_extra (CcLanguageChooser *chooser)
{
- CcLanguageChooserPrivate *priv = chooser->priv;
- return priv->showing_extra;
+ CcLanguageChooserPrivate *priv = chooser->priv;
+ return priv->showing_extra;
}
diff --git a/gnome-initial-setup/pages/language/cc-language-chooser.h
b/gnome-initial-setup/pages/language/cc-language-chooser.h
index ff46165..dd1f475 100644
--- a/gnome-initial-setup/pages/language/cc-language-chooser.h
+++ b/gnome-initial-setup/pages/language/cc-language-chooser.h
@@ -1,5 +1,5 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
* Copyright (C) 2013 Red Hat
*
* This program is free software; you can redistribute it and/or
@@ -43,14 +43,14 @@ typedef struct _CcLanguageChooserPrivate CcLanguageChooserPrivate;
struct _CcLanguageChooser
{
- GtkBin parent;
+ GtkBin parent;
- CcLanguageChooserPrivate *priv;
+ CcLanguageChooserPrivate *priv;
};
struct _CcLanguageChooserClass
{
- GtkBinClass parent_class;
+ GtkBinClass parent_class;
};
GType cc_language_chooser_get_type (void);
@@ -58,7 +58,7 @@ GType cc_language_chooser_get_type (void);
void cc_language_chooser_clear_filter (CcLanguageChooser *chooser);
const gchar * cc_language_chooser_get_language (CcLanguageChooser *chooser);
void cc_language_chooser_set_language (CcLanguageChooser *chooser,
- const gchar *language);
+ const gchar *language);
gboolean cc_language_chooser_get_showing_extra (CcLanguageChooser *chooser);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
