[gedit/wip/merge-encoding-settings: 4/5] EncodingsDialog: show UTF-8 in the available encodings

[Sébastien Wilmet <swilmet src gnome org>]

commit ba2d7d8cc315902a803749f27faba16db92d0ecd
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Tue Aug 12 18:42:46 2014 +0200

    EncodingsDialog: show UTF-8 in the available encodings

 gedit/gedit-encodings-dialog.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/gedit/gedit-encodings-dialog.c b/gedit/gedit-encodings-dialog.c
index abe44d0..4e25762 100644
--- a/gedit/gedit-encodings-dialog.c
+++ b/gedit/gedit-encodings-dialog.c
@@ -289,17 +289,11 @@ init_shown_in_menu_tree_model (GeditEncodingsDialog *dialog)
 }
 
 static void
-insert_encoding_foreach_cb (const GtkSourceEncoding *encoding,
-                           GeditEncodingsDialog    *dlg)
+insert_available_encoding_foreach_cb (const GtkSourceEncoding *encoding,
+                                     GeditEncodingsDialog    *dlg)
 {
        GtkTreeIter iter;
 
-       if (encoding == gtk_source_encoding_get_utf8 ())
-       {
-               /* The UTF-8 encoding is always added to the combobox. */
-               return;
-       }
-
        gtk_list_store_append (dlg->priv->liststore_available, &iter);
 
        gtk_list_store_set (dlg->priv->liststore_available,
@@ -335,7 +329,7 @@ gedit_encodings_dialog_init (GeditEncodingsDialog *dlg)
        /* Tree view of available encodings */
 
        /* Add the data */
-       gtk_source_encoding_foreach ((GtkSourceEncodingForeachFunc) insert_encoding_foreach_cb,
+       gtk_source_encoding_foreach ((GtkSourceEncodingForeachFunc) insert_available_encoding_foreach_cb,
                                     dlg);
 
        /* Sort model */