ephy-encodings: rewrite to drop usage of EphyNode

We have a new 'EphyEncoding' object holding the encoding data, and the
EphyEncodings object is now just a hash table holding a bunch of
these.

Change all the UI code to use the new APIs.

https://bugzilla.gnome.org/show_bug.cgi?id=680735

1 files changed, 99 insertions, 0 deletions

diff --git a/embed/ephy-encoding.h b/embed/ephy-encoding.h
new file mode 100644
index 000000000..f27c132bb
--- /dev/null
+++ b/embed/ephy-encoding.h
@@ -0,0 +1,99 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
+#ifndef EPHY_ENCODING_H
+#define EPHY_ENCODING_H
+
+#include <glib-object.h>
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#define EPHY_TYPE_ENCODING         (ephy_encoding_get_type ())
+#define EPHY_ENCODING(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_ENCODING, EphyEncoding))
+#define EPHY_ENCODING_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_ENCODING, EphyEncodingClass))
+#define EPHY_IS_ENCODING(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_ENCODING))
+#define EPHY_IS_ENCODING_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_ENCODING))
+#define EPHY_ENCODING_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_ENCODING, EphyEncodingClass))
+
+typedef struct _EphyEncodingClass    EphyEncodingClass;
+typedef struct _EphyEncoding         EphyEncoding;
+typedef struct _EphyEncodingPrivate  EphyEncodingPrivate;
+
+struct _EphyEncoding
+{
+  GObject parent;
+
+  /*< private >*/
+  EphyEncodingPrivate *priv;
+};
+
+struct _EphyEncodingClass
+{
+  GObjectClass parent_class;
+};
+
+typedef enum
+{
+	LG_NONE			= 0,
+	LG_ARABIC		= 1 << 0,
+	LG_BALTIC		= 1 << 1,
+	LG_CAUCASIAN		= 1 << 2,
+	LG_C_EUROPEAN		= 1 << 3,
+	LG_CHINESE_TRAD		= 1 << 4,
+	LG_CHINESE_SIMP		= 1 << 5,
+	LG_CYRILLIC		= 1 << 6,
+	LG_GREEK		= 1 << 7,
+	LG_HEBREW		= 1 << 8,
+	LG_INDIAN		= 1 << 9,
+	LG_JAPANESE		= 1 << 10,
+	LG_KOREAN		= 1 << 12,
+	LG_NORDIC		= 1 << 13,
+	LG_PERSIAN		= 1 << 14,
+	LG_SE_EUROPEAN		= 1 << 15,
+	LG_THAI			= 1 << 16,
+	LG_TURKISH		= 1 << 17,
+	LG_UKRAINIAN		= 1 << 18,
+	LG_UNICODE		= 1 << 19,
+	LG_VIETNAMESE		= 1 << 20,
+	LG_WESTERN		= 1 << 21,
+	LG_ALL			= 0x3fffff,
+}
+  EphyLanguageGroup;
+
+GType          ephy_encoding_get_type             (void);
+EphyEncoding * ephy_encoding_new                  (const char *encoding,
+                                                   const char *title,
+                                                   const char *title_elided,
+                                                   const char *collation_key,
+                                                   int language_groups);
+const char    * ephy_encoding_get_title           (EphyEncoding *encoding);
+const char    * ephy_encoding_get_title_elided    (EphyEncoding *encoding);
+const char    * ephy_encoding_get_encoding        (EphyEncoding *encoding);
+const char    * ephy_encoding_get_collation_key   (EphyEncoding *encoding);
+int             ephy_encoding_get_language_groups (EphyEncoding *encoding);
+
+G_END_DECLS
+
+#endif