[epiphany] ephy-encodings: use new coding style
- From: Xan Lopez <xan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-encodings: use new coding style
- Date: Tue, 31 Jul 2012 13:04:41 +0000 (UTC)
commit 0be50f8a215ffe758b9915da7c5c4e1b9cf37285
Author: Xan Lopez <xan igalia com>
Date: Tue Jul 31 15:00:28 2012 +0200
ephy-encodings: use new coding style
embed/ephy-encodings.c | 598 +++++++++++++++++++++++------------------------
embed/ephy-encodings.h | 66 +++---
2 files changed, 324 insertions(+), 340 deletions(-)
---
diff --git a/embed/ephy-encodings.c b/embed/ephy-encodings.c
index 511efc4..abe7659 100644
--- a/embed/ephy-encodings.c
+++ b/embed/ephy-encodings.c
@@ -1,7 +1,8 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* Copyright  2003 Marco Pesenti Gritti
* Copyright  2003 Christian Persch
+ * Copyright  2012 Igalia S.L.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -33,415 +34,402 @@
struct _EphyEncodingsPrivate
{
- GHashTable *hash;
- GSList *recent;
+ GHashTable *hash;
+ GSList *recent;
};
/*
- * translatable encodings titles
- * NOTE: if you add/remove/change encodings, please also update the schema in
- * epiphany.schemas.in
+ * Translatable encodings titles.
+ * NOTE: if you add/remove/change encodings, please also update the
+ * schema in epiphany.schemas.in
*/
static const
struct
{
- char *title;
- char *code;
- EphyLanguageGroup groups;
+ char *title;
+ char *code;
+ EphyLanguageGroup groups;
}
encoding_entries [] =
{
- { N_("Arabic (_IBM-864)"), "IBM864", LG_ARABIC },
- { N_("Arabic (ISO-_8859-6)"), "ISO-8859-6", LG_ARABIC },
- { N_("Arabic (_MacArabic)"), "x-mac-arabic", LG_ARABIC },
- { N_("Arabic (_Windows-1256)"), "windows-1256", LG_ARABIC },
- { N_("Baltic (_ISO-8859-13)"), "ISO-8859-13", LG_BALTIC },
- { N_("Baltic (I_SO-8859-4)"), "ISO-8859-4", LG_BALTIC },
- { N_("Baltic (_Windows-1257)"), "windows-1257", LG_BALTIC },
- { N_("_Armenian (ARMSCII-8)"), "armscii-8", LG_CAUCASIAN },
- { N_("_Georgian (GEOSTD8)"), "geostd8", LG_CAUCASIAN },
- { N_("Central European (_IBM-852)"), "IBM852", LG_C_EUROPEAN },
- { N_("Central European (I_SO-8859-2)"), "ISO-8859-2", LG_C_EUROPEAN },
- { N_("Central European (_MacCE)"), "x-mac-ce", LG_C_EUROPEAN },
- { N_("Central European (_Windows-1250)"), "windows-1250", LG_C_EUROPEAN },
- { N_("Chinese Simplified (_GB18030)"), "gb18030", LG_CHINESE_SIMP },
- { N_("Chinese Simplified (G_B2312)"), "GB2312", LG_CHINESE_SIMP },
- { N_("Chinese Simplified (GB_K)"), "x-gbk", LG_CHINESE_SIMP },
- { N_("Chinese Simplified (_HZ)"), "HZ-GB-2312", LG_CHINESE_SIMP },
- { N_("Chinese Simplified (_ISO-2022-CN)"), "ISO-2022-CN", LG_CHINESE_SIMP },
- { N_("Chinese Traditional (Big_5)"), "Big5", LG_CHINESE_TRAD },
- { N_("Chinese Traditional (Big5-HK_SCS)"), "Big5-HKSCS", LG_CHINESE_TRAD },
- { N_("Chinese Traditional (_EUC-TW)"), "x-euc-tw", LG_CHINESE_TRAD },
- { N_("Cyrillic (_IBM-855)"), "IBM855", LG_CYRILLIC },
- { N_("Cyrillic (I_SO-8859-5)"), "ISO-8859-5", LG_CYRILLIC },
- { N_("Cyrillic (IS_O-IR-111)"), "ISO-IR-111", LG_CYRILLIC },
- { N_("Cyrillic (_KOI8-R)"), "KOI8-R", LG_CYRILLIC },
- { N_("Cyrillic (_MacCyrillic)"), "x-mac-cyrillic", LG_CYRILLIC },
- { N_("Cyrillic (_Windows-1251)"), "windows-1251", LG_CYRILLIC },
- { N_("Cyrillic/_Russian (IBM-866)"), "IBM866", LG_CYRILLIC },
- { N_("Greek (_ISO-8859-7)"), "ISO-8859-7", LG_GREEK },
- { N_("Greek (_MacGreek)"), "x-mac-greek", LG_GREEK },
- { N_("Greek (_Windows-1253)"), "windows-1253", LG_GREEK },
- { N_("Gujarati (_MacGujarati)"), "x-mac-gujarati", LG_INDIAN },
- { N_("Gurmukhi (Mac_Gurmukhi)"), "x-mac-gurmukhi", LG_INDIAN },
- { N_("Hindi (Mac_Devanagari)"), "x-mac-devanagari", LG_INDIAN },
- { N_("Hebrew (_IBM-862)"), "IBM862", LG_HEBREW },
- { N_("Hebrew (IS_O-8859-8-I)"), "ISO-8859-8-I", LG_HEBREW },
- { N_("Hebrew (_MacHebrew)"), "x-mac-hebrew", LG_HEBREW },
- { N_("Hebrew (_Windows-1255)"), "windows-1255", LG_HEBREW },
- { N_("_Visual Hebrew (ISO-8859-8)"), "ISO-8859-8", LG_HEBREW },
- { N_("Japanese (_EUC-JP)"), "EUC-JP", LG_JAPANESE },
- { N_("Japanese (_ISO-2022-JP)"), "ISO-2022-JP", LG_JAPANESE },
- { N_("Japanese (_Shift-JIS)"), "Shift_JIS", LG_JAPANESE },
- { N_("Korean (_EUC-KR)"), "EUC-KR", LG_KOREAN },
- { N_("Korean (_ISO-2022-KR)"), "ISO-2022-KR", LG_KOREAN },
- { N_("Korean (_JOHAB)"), "x-johab", LG_KOREAN },
- { N_("Korean (_UHC)"), "x-windows-949", LG_KOREAN },
- { N_("_Celtic (ISO-8859-14)"), "ISO-8859-14", LG_NORDIC },
- { N_("_Icelandic (MacIcelandic)"), "x-mac-icelandic", LG_NORDIC },
- { N_("_Nordic (ISO-8859-10)"), "ISO-8859-10", LG_NORDIC },
- { N_("_Persian (MacFarsi)"), "x-mac-farsi", LG_PERSIAN },
- { N_("Croatian (Mac_Croatian)"), "x-mac-croatian", LG_SE_EUROPEAN },
- { N_("_Romanian (MacRomanian)"), "x-mac-romanian", LG_SE_EUROPEAN },
- { N_("R_omanian (ISO-8859-16)"), "ISO-8859-16", LG_SE_EUROPEAN },
- { N_("South _European (ISO-8859-3)"), "ISO-8859-3", LG_SE_EUROPEAN },
- { N_("Thai (TIS-_620)"), "TIS-620", LG_THAI },
- { N_("Thai (IS_O-8859-11)"), "iso-8859-11", LG_THAI },
- { N_("_Thai (Windows-874)"), "windows-874", LG_THAI },
- { N_("Turkish (_IBM-857)"), "IBM857", LG_TURKISH },
- { N_("Turkish (I_SO-8859-9)"), "ISO-8859-9", LG_TURKISH },
- { N_("Turkish (_MacTurkish)"), "x-mac-turkish", LG_TURKISH },
- { N_("Turkish (_Windows-1254)"), "windows-1254", LG_TURKISH },
- { N_("Unicode (UTF-_8)"), "UTF-8", LG_UNICODE },
- { N_("Cyrillic/Ukrainian (_KOI8-U)"), "KOI8-U", LG_UKRAINIAN },
- { N_("Cyrillic/Ukrainian (Mac_Ukrainian)"), "x-mac-ukrainian", LG_UKRAINIAN },
- { N_("Vietnamese (_TCVN)"), "x-viet-tcvn5712", LG_VIETNAMESE },
- { N_("Vietnamese (_VISCII)"), "VISCII", LG_VIETNAMESE },
- { N_("Vietnamese (V_PS)"), "x-viet-vps", LG_VIETNAMESE },
- { N_("Vietnamese (_Windows-1258)"), "windows-1258", LG_VIETNAMESE },
- { N_("Western (_IBM-850)"), "IBM850", LG_WESTERN },
- { N_("Western (_ISO-8859-1)"), "ISO-8859-1", LG_WESTERN },
- { N_("Western (IS_O-8859-15)"), "ISO-8859-15", LG_WESTERN },
- { N_("Western (_MacRoman)"), "x-mac-roman", LG_WESTERN },
- { N_("Western (_Windows-1252)"), "windows-1252", LG_WESTERN },
-
- /* the following encodings are so rarely used that we don't want to pollute the "related"
- * part of the encodings menu with them, so we set the language group to 0 here
- */
- { N_("English (_US-ASCII)"), "us-ascii", 0 },
- { N_("Unicode (UTF-_16 BE)"), "UTF-16BE", 0 },
- { N_("Unicode (UTF-1_6 LE)"), "UTF-16LE", 0 },
- { N_("Unicode (UTF-_32 BE)"), "UTF-32BE", 0 },
- { N_("Unicode (UTF-3_2 LE)"), "UTF-32LE", 0 },
+ { N_("Arabic (_IBM-864)"), "IBM864", LG_ARABIC },
+ { N_("Arabic (ISO-_8859-6)"), "ISO-8859-6", LG_ARABIC },
+ { N_("Arabic (_MacArabic)"), "x-mac-arabic", LG_ARABIC },
+ { N_("Arabic (_Windows-1256)"), "windows-1256", LG_ARABIC },
+ { N_("Baltic (_ISO-8859-13)"), "ISO-8859-13", LG_BALTIC },
+ { N_("Baltic (I_SO-8859-4)"), "ISO-8859-4", LG_BALTIC },
+ { N_("Baltic (_Windows-1257)"), "windows-1257", LG_BALTIC },
+ { N_("_Armenian (ARMSCII-8)"), "armscii-8", LG_CAUCASIAN },
+ { N_("_Georgian (GEOSTD8)"), "geostd8", LG_CAUCASIAN },
+ { N_("Central European (_IBM-852)"), "IBM852", LG_C_EUROPEAN },
+ { N_("Central European (I_SO-8859-2)"), "ISO-8859-2", LG_C_EUROPEAN },
+ { N_("Central European (_MacCE)"), "x-mac-ce", LG_C_EUROPEAN },
+ { N_("Central European (_Windows-1250)"), "windows-1250", LG_C_EUROPEAN },
+ { N_("Chinese Simplified (_GB18030)"), "gb18030", LG_CHINESE_SIMP },
+ { N_("Chinese Simplified (G_B2312)"), "GB2312", LG_CHINESE_SIMP },
+ { N_("Chinese Simplified (GB_K)"), "x-gbk", LG_CHINESE_SIMP },
+ { N_("Chinese Simplified (_HZ)"), "HZ-GB-2312", LG_CHINESE_SIMP },
+ { N_("Chinese Simplified (_ISO-2022-CN)"), "ISO-2022-CN", LG_CHINESE_SIMP },
+ { N_("Chinese Traditional (Big_5)"), "Big5", LG_CHINESE_TRAD },
+ { N_("Chinese Traditional (Big5-HK_SCS)"), "Big5-HKSCS", LG_CHINESE_TRAD },
+ { N_("Chinese Traditional (_EUC-TW)"), "x-euc-tw", LG_CHINESE_TRAD },
+ { N_("Cyrillic (_IBM-855)"), "IBM855", LG_CYRILLIC },
+ { N_("Cyrillic (I_SO-8859-5)"), "ISO-8859-5", LG_CYRILLIC },
+ { N_("Cyrillic (IS_O-IR-111)"), "ISO-IR-111", LG_CYRILLIC },
+ { N_("Cyrillic (_KOI8-R)"), "KOI8-R", LG_CYRILLIC },
+ { N_("Cyrillic (_MacCyrillic)"), "x-mac-cyrillic", LG_CYRILLIC },
+ { N_("Cyrillic (_Windows-1251)"), "windows-1251", LG_CYRILLIC },
+ { N_("Cyrillic/_Russian (IBM-866)"), "IBM866", LG_CYRILLIC },
+ { N_("Greek (_ISO-8859-7)"), "ISO-8859-7", LG_GREEK },
+ { N_("Greek (_MacGreek)"), "x-mac-greek", LG_GREEK },
+ { N_("Greek (_Windows-1253)"), "windows-1253", LG_GREEK },
+ { N_("Gujarati (_MacGujarati)"), "x-mac-gujarati", LG_INDIAN },
+ { N_("Gurmukhi (Mac_Gurmukhi)"), "x-mac-gurmukhi", LG_INDIAN },
+ { N_("Hindi (Mac_Devanagari)"), "x-mac-devanagari", LG_INDIAN },
+ { N_("Hebrew (_IBM-862)"), "IBM862", LG_HEBREW },
+ { N_("Hebrew (IS_O-8859-8-I)"), "ISO-8859-8-I", LG_HEBREW },
+ { N_("Hebrew (_MacHebrew)"), "x-mac-hebrew", LG_HEBREW },
+ { N_("Hebrew (_Windows-1255)"), "windows-1255", LG_HEBREW },
+ { N_("_Visual Hebrew (ISO-8859-8)"), "ISO-8859-8", LG_HEBREW },
+ { N_("Japanese (_EUC-JP)"), "EUC-JP", LG_JAPANESE },
+ { N_("Japanese (_ISO-2022-JP)"), "ISO-2022-JP", LG_JAPANESE },
+ { N_("Japanese (_Shift-JIS)"), "Shift_JIS", LG_JAPANESE },
+ { N_("Korean (_EUC-KR)"), "EUC-KR", LG_KOREAN },
+ { N_("Korean (_ISO-2022-KR)"), "ISO-2022-KR", LG_KOREAN },
+ { N_("Korean (_JOHAB)"), "x-johab", LG_KOREAN },
+ { N_("Korean (_UHC)"), "x-windows-949", LG_KOREAN },
+ { N_("_Celtic (ISO-8859-14)"), "ISO-8859-14", LG_NORDIC },
+ { N_("_Icelandic (MacIcelandic)"), "x-mac-icelandic", LG_NORDIC },
+ { N_("_Nordic (ISO-8859-10)"), "ISO-8859-10", LG_NORDIC },
+ { N_("_Persian (MacFarsi)"), "x-mac-farsi", LG_PERSIAN },
+ { N_("Croatian (Mac_Croatian)"), "x-mac-croatian", LG_SE_EUROPEAN },
+ { N_("_Romanian (MacRomanian)"), "x-mac-romanian", LG_SE_EUROPEAN },
+ { N_("R_omanian (ISO-8859-16)"), "ISO-8859-16", LG_SE_EUROPEAN },
+ { N_("South _European (ISO-8859-3)"), "ISO-8859-3", LG_SE_EUROPEAN },
+ { N_("Thai (TIS-_620)"), "TIS-620", LG_THAI },
+ { N_("Thai (IS_O-8859-11)"), "iso-8859-11", LG_THAI },
+ { N_("_Thai (Windows-874)"), "windows-874", LG_THAI },
+ { N_("Turkish (_IBM-857)"), "IBM857", LG_TURKISH },
+ { N_("Turkish (I_SO-8859-9)"), "ISO-8859-9", LG_TURKISH },
+ { N_("Turkish (_MacTurkish)"), "x-mac-turkish", LG_TURKISH },
+ { N_("Turkish (_Windows-1254)"), "windows-1254", LG_TURKISH },
+ { N_("Unicode (UTF-_8)"), "UTF-8", LG_UNICODE },
+ { N_("Cyrillic/Ukrainian (_KOI8-U)"), "KOI8-U", LG_UKRAINIAN },
+ { N_("Cyrillic/Ukrainian (Mac_Ukrainian)"), "x-mac-ukrainian", LG_UKRAINIAN },
+ { N_("Vietnamese (_TCVN)"), "x-viet-tcvn5712", LG_VIETNAMESE },
+ { N_("Vietnamese (_VISCII)"), "VISCII", LG_VIETNAMESE },
+ { N_("Vietnamese (V_PS)"), "x-viet-vps", LG_VIETNAMESE },
+ { N_("Vietnamese (_Windows-1258)"), "windows-1258", LG_VIETNAMESE },
+ { N_("Western (_IBM-850)"), "IBM850", LG_WESTERN },
+ { N_("Western (_ISO-8859-1)"), "ISO-8859-1", LG_WESTERN },
+ { N_("Western (IS_O-8859-15)"), "ISO-8859-15", LG_WESTERN },
+ { N_("Western (_MacRoman)"), "x-mac-roman", LG_WESTERN },
+ { N_("Western (_Windows-1252)"), "windows-1252", LG_WESTERN },
+
+ /* The following encodings are so rarely used that we don't want to
+ * pollute the "related" part of the encodings menu with them, so we
+ * set the language group to 0 here.
+ */
+ { N_("English (_US-ASCII)"), "us-ascii", 0 },
+ { N_("Unicode (UTF-_16 BE)"), "UTF-16BE", 0 },
+ { N_("Unicode (UTF-1_6 LE)"), "UTF-16LE", 0 },
+ { N_("Unicode (UTF-_32 BE)"), "UTF-32BE", 0 },
+ { N_("Unicode (UTF-3_2 LE)"), "UTF-32LE", 0 },
};
-#define RECENT_MAX 4
+#define RECENT_MAX 4
G_DEFINE_TYPE (EphyEncodings, ephy_encodings, G_TYPE_OBJECT)
static void
ephy_encodings_finalize (GObject *object)
{
- EphyEncodings *encodings = EPHY_ENCODINGS (object);
+ EphyEncodings *encodings = EPHY_ENCODINGS (object);
- g_hash_table_destroy (encodings->priv->hash);
+ g_hash_table_destroy (encodings->priv->hash);
- g_slist_foreach (encodings->priv->recent, (GFunc)g_free, NULL);
- g_slist_free (encodings->priv->recent);
+ g_slist_foreach (encodings->priv->recent, (GFunc)g_free, NULL);
+ g_slist_free (encodings->priv->recent);
- LOG ("EphyEncodings finalised");
+ LOG ("EphyEncodings finalised");
- G_OBJECT_CLASS (ephy_encodings_parent_class)->finalize (object);
+ G_OBJECT_CLASS (ephy_encodings_parent_class)->finalize (object);
}
static void
ephy_encodings_class_init (EphyEncodingsClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- object_class->finalize = ephy_encodings_finalize;
-
- /**
- * EphyEncodings::encoding-added:
- *
- * The ::encoding-added signal is emitted when @encodings receives a new encoding.
- **/
- g_signal_new ("encoding-added",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE,
- 1, G_TYPE_OBJECT);
-
- g_type_class_add_private (object_class, sizeof (EphyEncodingsPrivate));
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->finalize = ephy_encodings_finalize;
+
+ /**
+ * EphyEncodings::encoding-added:
+ *
+ * The ::encoding-added signal is emitted when @encodings receives a new encoding.
+ **/
+ g_signal_new ("encoding-added",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE,
+ 1, G_TYPE_OBJECT);
+
+ g_type_class_add_private (object_class, sizeof (EphyEncodingsPrivate));
}
-/* copied from egg-toolbar-editor.c */
+/* Copied from egg-toolbar-editor.c */
static char *
elide_underscores (const char *original)
{
- char *q, *result;
- const char *p;
- gboolean last_underscore;
-
- q = result = g_malloc (strlen (original) + 1);
- last_underscore = FALSE;
-
- for (p = original; *p; p++)
- {
- if (!last_underscore && *p == '_')
- {
- last_underscore = TRUE;
- }
- else
- {
- last_underscore = FALSE;
- *q++ = *p;
- }
- }
-
- *q = '\0';
-
- return result;
+ char *q, *result;
+ const char *p;
+ gboolean last_underscore;
+
+ q = result = g_malloc (strlen (original) + 1);
+ last_underscore = FALSE;
+
+ for (p = original; *p; p++) {
+ if (!last_underscore && *p == '_') {
+ last_underscore = TRUE;
+ }
+ else {
+ last_underscore = FALSE;
+ *q++ = *p;
+ }
+ }
+
+ *q = '\0';
+
+ return result;
}
static EphyEncoding *
add_encoding (EphyEncodings *encodings,
- const char *title,
- const char *code,
- EphyLanguageGroup groups)
+ const char *title,
+ const char *code,
+ EphyLanguageGroup groups)
{
- EphyEncoding *encoding;
- char *elided, *collate_key, *normalised;
+ EphyEncoding *encoding;
+ char *elided, *collate_key, *normalised;
- /* Create node. */
- elided = elide_underscores (title);
- normalised = g_utf8_normalize (elided, -1, G_NORMALIZE_DEFAULT);
- collate_key = g_utf8_collate_key (normalised, -1);
+ /* Create node. */
+ elided = elide_underscores (title);
+ normalised = g_utf8_normalize (elided, -1, G_NORMALIZE_DEFAULT);
+ collate_key = g_utf8_collate_key (normalised, -1);
- encoding = ephy_encoding_new (code, title,
- normalised, collate_key,
- groups);
- /* Add it. */
- g_hash_table_insert (encodings->priv->hash, g_strdup (code), encoding);
+ encoding = ephy_encoding_new (code, title,
+ normalised, collate_key,
+ groups);
+ /* Add it. */
+ g_hash_table_insert (encodings->priv->hash, g_strdup (code), encoding);
- g_signal_emit_by_name (encodings, "encoding-added", encoding);
+ g_signal_emit_by_name (encodings, "encoding-added", encoding);
- g_free (collate_key);
- g_free (normalised);
- g_free (elided);
+ g_free (collate_key);
+ g_free (normalised);
+ g_free (elided);
- return encoding;
+ return encoding;
}
EphyEncoding *
ephy_encodings_get_encoding (EphyEncodings *encodings,
- const char *code,
- gboolean add_if_not_found)
+ const char *code,
+ gboolean add_if_not_found)
{
- EphyEncoding *encoding;
+ EphyEncoding *encoding;
- g_return_val_if_fail (EPHY_IS_ENCODINGS (encodings), NULL);
+ g_return_val_if_fail (EPHY_IS_ENCODINGS (encodings), NULL);
- encoding = g_hash_table_lookup (encodings->priv->hash, code);
+ encoding = g_hash_table_lookup (encodings->priv->hash, code);
- /* if it doesn't exist, add a node for it */
- if (!EPHY_IS_ENCODING (encoding) && add_if_not_found)
- {
- char *title;
+ /* if it doesn't exist, add a node for it */
+ if (!EPHY_IS_ENCODING (encoding) && add_if_not_found) {
+ char *title;
- /* Translators: this is the title that an unknown encoding will
- * be displayed as.
- */
- title = g_strdup_printf (_("Unknown (%s)"), code);
- encoding = add_encoding (encodings, title, code, 0);
- g_free (title);
- }
+ /* Translators: this is the title that an unknown encoding will
+ * be displayed as.
+ */
+ title = g_strdup_printf (_("Unknown (%s)"), code);
+ encoding = add_encoding (encodings, title, code, 0);
+ g_free (title);
+ }
- return encoding;
+ return encoding;
}
typedef struct {
- GList *list;
- EphyLanguageGroup group_mask;
+ GList *list;
+ EphyLanguageGroup group_mask;
} GetEncodingsData;
static void
get_encodings_foreach (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
- GetEncodingsData *data = (GetEncodingsData*)user_data;
- EphyLanguageGroup group;
-
- group = ephy_encoding_get_language_groups (EPHY_ENCODING (value));
- if ((group & data->group_mask) != 0)
- {
- data->list = g_list_prepend (data->list, value);
- }
+ GetEncodingsData *data = (GetEncodingsData*)user_data;
+ EphyLanguageGroup group;
+
+ group = ephy_encoding_get_language_groups (EPHY_ENCODING (value));
+ if ((group & data->group_mask) != 0)
+ data->list = g_list_prepend (data->list, value);
}
GList *
ephy_encodings_get_encodings (EphyEncodings *encodings,
- EphyLanguageGroup group_mask)
+ EphyLanguageGroup group_mask)
{
- GList *list = NULL;
- GetEncodingsData data;
+ GList *list = NULL;
+ GetEncodingsData data;
- data.list = list;
- data.group_mask = group_mask;
+ data.list = list;
+ data.group_mask = group_mask;
- g_hash_table_foreach (encodings->priv->hash, (GHFunc)get_encodings_foreach, &data);
+ g_hash_table_foreach (encodings->priv->hash, (GHFunc)get_encodings_foreach, &data);
- return list;
+ return list;
}
static void
get_all_encodings (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
- GList **l = (GList**)user_data;
+ GList **l = (GList**)user_data;
- *l = g_list_prepend (*l, value);
+ *l = g_list_prepend (*l, value);
}
GList *
ephy_encodings_get_all (EphyEncodings *encodings)
{
- GList *l = NULL;
+ GList *l = NULL;
- g_return_val_if_fail (EPHY_IS_ENCODINGS (encodings), NULL);
+ g_return_val_if_fail (EPHY_IS_ENCODINGS (encodings), NULL);
- g_hash_table_foreach (encodings->priv->hash, (GHFunc)get_all_encodings, &l);
+ g_hash_table_foreach (encodings->priv->hash, (GHFunc)get_all_encodings, &l);
- return l;
+ return l;
}
void
ephy_encodings_add_recent (EphyEncodings *encodings,
- const char *code)
+ const char *code)
{
- GSList *element, *l;
- GVariantBuilder builder;
- EphyEncodingsPrivate *priv = encodings->priv;
-
- g_return_if_fail (EPHY_IS_ENCODINGS (encodings));
- g_return_if_fail (code != NULL);
-
- if (ephy_encodings_get_encoding (encodings, code, FALSE) == NULL)
- return;
-
- /* Keep the list elements unique. */
- element = g_slist_find_custom (priv->recent, code,
- (GCompareFunc)strcmp);
- if (element != NULL)
- {
- g_free (element->data);
- priv->recent =
- g_slist_remove_link (priv->recent, element);
- }
-
- /* Add the new code upfront. */
- priv->recent =
- g_slist_prepend (priv->recent, g_strdup (code));
-
- /* Truncate the list if necessary; it's at most 1 element too much. */
- if (g_slist_length (priv->recent) > RECENT_MAX)
- {
- GSList *tail;
-
- tail = g_slist_last (priv->recent);
- g_free (tail->data);
- priv->recent =
- g_slist_remove_link (priv->recent, tail);
- }
-
- g_variant_builder_init (&builder, G_VARIANT_TYPE_STRING_ARRAY);
- for (l = priv->recent; l; l = l->next)
- {
- g_variant_builder_add (&builder, "s", l->data);
- }
-
- g_settings_set (EPHY_SETTINGS_STATE,
- EPHY_PREFS_STATE_RECENT_ENCODINGS,
- "as", &builder);
+ GSList *element, *l;
+ GVariantBuilder builder;
+ EphyEncodingsPrivate *priv = encodings->priv;
+
+ g_return_if_fail (EPHY_IS_ENCODINGS (encodings));
+ g_return_if_fail (code != NULL);
+
+ if (ephy_encodings_get_encoding (encodings, code, FALSE) == NULL)
+ return;
+
+ /* Keep the list elements unique. */
+ element = g_slist_find_custom (priv->recent, code,
+ (GCompareFunc)strcmp);
+ if (element != NULL) {
+ g_free (element->data);
+ priv->recent =
+ g_slist_remove_link (priv->recent, element);
+ }
+
+ /* Add the new code upfront. */
+ priv->recent =
+ g_slist_prepend (priv->recent, g_strdup (code));
+
+ /* Truncate the list if necessary; it's at most 1 element too much. */
+ if (g_slist_length (priv->recent) > RECENT_MAX) {
+ GSList *tail;
+
+ tail = g_slist_last (priv->recent);
+ g_free (tail->data);
+ priv->recent =
+ g_slist_remove_link (priv->recent, tail);
+ }
+
+ g_variant_builder_init (&builder, G_VARIANT_TYPE_STRING_ARRAY);
+ for (l = priv->recent; l; l = l->next)
+ g_variant_builder_add (&builder, "s", l->data);
+
+ g_settings_set (EPHY_SETTINGS_STATE,
+ EPHY_PREFS_STATE_RECENT_ENCODINGS,
+ "as", &builder);
}
GList *
ephy_encodings_get_recent (EphyEncodings *encodings)
{
- GSList *l;
- GList *list = NULL;
+ GSList *l;
+ GList *list = NULL;
- g_return_val_if_fail (EPHY_IS_ENCODINGS (encodings), NULL);
+ g_return_val_if_fail (EPHY_IS_ENCODINGS (encodings), NULL);
- for (l = encodings->priv->recent; l != NULL; l = l->next)
- {
- EphyEncoding *encoding;
+ for (l = encodings->priv->recent; l != NULL; l = l->next) {
+ EphyEncoding *encoding;
- encoding = ephy_encodings_get_encoding (encodings, (char *)l->data, FALSE);
- g_return_val_if_fail (EPHY_IS_ENCODING (encoding), NULL);
+ encoding = ephy_encodings_get_encoding (encodings, (char *)l->data, FALSE);
+ g_return_val_if_fail (EPHY_IS_ENCODING (encoding), NULL);
- list = g_list_prepend (list, encoding);
- }
+ list = g_list_prepend (list, encoding);
+ }
- return list;
+ return list;
}
static void
ephy_encodings_init (EphyEncodings *encodings)
{
- char **list;
- int i;
-
- encodings->priv = EPHY_ENCODINGS_GET_PRIVATE (encodings);
-
- LOG ("EphyEncodings initialising");
-
- encodings->priv->hash = g_hash_table_new_full (g_str_hash, g_str_equal,
- (GDestroyNotify)g_free,
- (GDestroyNotify)g_object_unref);
-
- /* Fill the db. */
- for (i = 0; i < G_N_ELEMENTS (encoding_entries); i++)
- {
- add_encoding (encodings,
- _(encoding_entries[i].title),
- encoding_entries[i].code,
- encoding_entries[i].groups);
- }
-
- /* Get the list of recently used encodings. */
- list = g_settings_get_strv (EPHY_SETTINGS_STATE,
- EPHY_PREFS_STATE_RECENT_ENCODINGS);
-
- /* Make sure the list has no duplicates (GtkUIManager goes
- * crazy otherwise), and only valid entries.
- */
- encodings->priv->recent = NULL;
- for (i = 0; list[i]; i++)
- {
- char *item;
- item = list[i];
-
- if (g_slist_find (encodings->priv->recent, item) == NULL
- && g_slist_length (encodings->priv->recent) < RECENT_MAX
- && ephy_encodings_get_encoding (encodings, item, FALSE) != NULL)
- {
- encodings->priv->recent =
- g_slist_prepend (encodings->priv->recent,
- g_strdup (item));
- }
- }
- encodings->priv->recent = g_slist_reverse (encodings->priv->recent);
- g_strfreev (list);
+ char **list;
+ int i;
+
+ encodings->priv = EPHY_ENCODINGS_GET_PRIVATE (encodings);
+
+ LOG ("EphyEncodings initialising");
+
+ encodings->priv->hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+ (GDestroyNotify)g_free,
+ (GDestroyNotify)g_object_unref);
+
+ /* Fill the db. */
+ for (i = 0; i < G_N_ELEMENTS (encoding_entries); i++) {
+ add_encoding (encodings,
+ _(encoding_entries[i].title),
+ encoding_entries[i].code,
+ encoding_entries[i].groups);
+ }
+
+ /* Get the list of recently used encodings. */
+ list = g_settings_get_strv (EPHY_SETTINGS_STATE,
+ EPHY_PREFS_STATE_RECENT_ENCODINGS);
+
+ /* Make sure the list has no duplicates (GtkUIManager goes
+ * crazy otherwise), and only valid entries.
+ */
+ encodings->priv->recent = NULL;
+ for (i = 0; list[i]; i++) {
+ char *item;
+ item = list[i];
+
+ if (g_slist_find (encodings->priv->recent, item) == NULL
+ && g_slist_length (encodings->priv->recent) < RECENT_MAX
+ && ephy_encodings_get_encoding (encodings, item, FALSE) != NULL) {
+ encodings->priv->recent = g_slist_prepend (encodings->priv->recent,
+ g_strdup (item));
+ }
+ }
+
+ encodings->priv->recent = g_slist_reverse (encodings->priv->recent);
+ g_strfreev (list);
}
EphyEncodings *
ephy_encodings_new (void)
{
- return g_object_new (EPHY_TYPE_ENCODINGS, NULL);
+ return g_object_new (EPHY_TYPE_ENCODINGS, NULL);
}
diff --git a/embed/ephy-encodings.h b/embed/ephy-encodings.h
index d7e7221..04ea01e 100644
--- a/embed/ephy-encodings.h
+++ b/embed/ephy-encodings.h
@@ -1,5 +1,7 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* Copyright  2003, 2004 Christian Persch
+ * Copyright  2012 Igalia S.L.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -32,56 +34,50 @@
G_BEGIN_DECLS
-#define EPHY_TYPE_ENCODINGS (ephy_encodings_get_type ())
-#define EPHY_ENCODINGS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_ENCODINGS, EphyEncodings))
-#define EPHY_ENCODINGS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), EPHY_TYPE_ENCODINGS, EphyEncodingsClass))
-#define EPHY_IS_ENCODINGS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_ENCODINGS))
-#define EPHY_IS_ENCODINGS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_ENCODINGS))
-#define EPHY_ENCODINGS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_ENCODINGS, EphyEncodingsClass))
+#define EPHY_TYPE_ENCODINGS (ephy_encodings_get_type ())
+#define EPHY_ENCODINGS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_ENCODINGS, EphyEncodings))
+#define EPHY_ENCODINGS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), EPHY_TYPE_ENCODINGS, EphyEncodingsClass))
+#define EPHY_IS_ENCODINGS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_ENCODINGS))
+#define EPHY_IS_ENCODINGS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_ENCODINGS))
+#define EPHY_ENCODINGS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_ENCODINGS, EphyEncodingsClass))
-typedef struct _EphyEncodings EphyEncodings;
-typedef struct _EphyEncodingsPrivate EphyEncodingsPrivate;
-typedef struct _EphyEncodingsClass EphyEncodingsClass;
+typedef struct _EphyEncodings EphyEncodings;
+typedef struct _EphyEncodingsPrivate EphyEncodingsPrivate;
+typedef struct _EphyEncodingsClass EphyEncodingsClass;
enum
{
- EPHY_NODE_ENCODING_PROP_TITLE = 1,
- EPHY_NODE_ENCODING_PROP_TITLE_ELIDED = 2,
- EPHY_NODE_ENCODING_PROP_COLLATION_KEY = 3,
- EPHY_NODE_ENCODING_PROP_ENCODING = 4,
- EPHY_NODE_ENCODING_PROP_LANGUAGE_GROUPS = 5,
+ EPHY_NODE_ENCODING_PROP_TITLE = 1,
+ EPHY_NODE_ENCODING_PROP_TITLE_ELIDED = 2,
+ EPHY_NODE_ENCODING_PROP_COLLATION_KEY = 3,
+ EPHY_NODE_ENCODING_PROP_ENCODING = 4,
+ EPHY_NODE_ENCODING_PROP_LANGUAGE_GROUPS = 5,
};
struct _EphyEncodings
{
- GObject parent;
+ GObject parent;
- /*< private >*/
- EphyEncodingsPrivate *priv;
+ /*< private >*/
+ EphyEncodingsPrivate *priv;
};
struct _EphyEncodingsClass
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
};
-GType ephy_encodings_get_type (void);
-
-EphyEncodings *ephy_encodings_new (void);
-
-EphyEncoding *ephy_encodings_get_encoding (EphyEncodings *encodings,
- const char *code,
- gboolean add_if_not_found);
-
-GList *ephy_encodings_get_encodings (EphyEncodings *encodings,
- EphyLanguageGroup group_mask);
-
-GList *ephy_encodings_get_all (EphyEncodings *encodings);
-
-void ephy_encodings_add_recent (EphyEncodings *encodings,
- const char *code);
-
-GList *ephy_encodings_get_recent (EphyEncodings *encodings);
+GType ephy_encodings_get_type (void);
+EphyEncodings *ephy_encodings_new (void);
+EphyEncoding *ephy_encodings_get_encoding (EphyEncodings *encodings,
+ const char *code,
+ gboolean add_if_not_found);
+GList *ephy_encodings_get_encodings (EphyEncodings *encodings,
+ EphyLanguageGroup group_mask);
+GList *ephy_encodings_get_all (EphyEncodings *encodings);
+void ephy_encodings_add_recent (EphyEncodings *encodings,
+ const char *code);
+GList *ephy_encodings_get_recent (EphyEncodings *encodings);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
