[gedit/wip/loader-saver: 11/54] io-error-info-bar: use GtkSourceEncoding

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

commit 27347783723faad3eaca35db3c4028dc96aaffa5
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Jun 12 00:28:46 2014 +0200

    io-error-info-bar: use GtkSourceEncoding

 gedit/gedit-io-error-info-bar.c |   18 +++++++++---------
 gedit/gedit-io-error-info-bar.h |   16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/gedit/gedit-io-error-info-bar.c b/gedit/gedit-io-error-info-bar.c
index e62aca8..ce0d02a 100644
--- a/gedit/gedit-io-error-info-bar.c
+++ b/gedit/gedit-io-error-info-bar.c
@@ -583,9 +583,9 @@ create_conversion_error_info_bar (const gchar *primary_text,
 }
 
 GtkWidget *
-gedit_io_loading_error_info_bar_new (GFile               *location,
-                                    const GeditEncoding *encoding,
-                                    const GError        *error)
+gedit_io_loading_error_info_bar_new (GFile                   *location,
+                                    const GtkSourceEncoding *encoding,
+                                    const GError            *error)
 {
        gchar *error_message = NULL;
        gchar *message_details = NULL;
@@ -623,7 +623,7 @@ gedit_io_loading_error_info_bar_new (GFile               *location,
        g_free (temp_uri_for_display);
 
        if (encoding != NULL)
-               encoding_name = gedit_encoding_to_string (encoding);
+               encoding_name = gtk_source_encoding_to_string (encoding);
        else
                encoding_name = g_strdup ("UTF-8");
 
@@ -699,9 +699,9 @@ gedit_io_loading_error_info_bar_new (GFile               *location,
 }
 
 GtkWidget *
-gedit_conversion_error_while_saving_info_bar_new (GFile               *location,
-                                                 const GeditEncoding *encoding,
-                                                 const GError        *error)
+gedit_conversion_error_while_saving_info_bar_new (GFile                   *location,
+                                                 const GtkSourceEncoding *encoding,
+                                                 const GError            *error)
 {
        gchar *error_message = NULL;
        gchar *message_details = NULL;
@@ -730,7 +730,7 @@ gedit_conversion_error_while_saving_info_bar_new (GFile               *location,
        uri_for_display = g_markup_escape_text (temp_uri_for_display, -1);
        g_free (temp_uri_for_display);
 
-       encoding_name = gedit_encoding_to_string (encoding);
+       encoding_name = gtk_source_encoding_to_string (encoding);
 
        error_message = g_strdup_printf (_("Could not save the file “%s” using the “%s” character encoding."),
                                         uri_for_display,
@@ -751,7 +751,7 @@ gedit_conversion_error_while_saving_info_bar_new (GFile               *location,
        return info_bar;
 }
 
-const GeditEncoding *
+const GtkSourceEncoding *
 gedit_conversion_error_info_bar_get_encoding (GtkWidget *info_bar)
 {
        gpointer menu;
diff --git a/gedit/gedit-io-error-info-bar.h b/gedit/gedit-io-error-info-bar.h
index 69c2258..a524673 100644
--- a/gedit/gedit-io-error-info-bar.h
+++ b/gedit/gedit-io-error-info-bar.h
@@ -21,22 +21,22 @@
 #ifndef __GEDIT_IO_ERROR_INFO_BAR_H__
 #define __GEDIT_IO_ERROR_INFO_BAR_H__
 
-#include <glib.h>
+#include <gtksourceview/gtksource.h>
 
 G_BEGIN_DECLS
 
-GtkWidget      *gedit_io_loading_error_info_bar_new                    (GFile               *location,
-                                                                        const GeditEncoding *encoding,
-                                                                        const GError        *error);
+GtkWidget      *gedit_io_loading_error_info_bar_new                    (GFile                   *location,
+                                                                        const GtkSourceEncoding *encoding,
+                                                                        const GError            *error);
 
 GtkWidget      *gedit_unrecoverable_reverting_error_info_bar_new       (GFile               *location,
                                                                         const GError        *error);
 
-GtkWidget      *gedit_conversion_error_while_saving_info_bar_new       (GFile               *location,
-                                                                        const GeditEncoding *encoding,
-                                                                        const GError        *error);
+GtkWidget      *gedit_conversion_error_while_saving_info_bar_new       (GFile                   *location,
+                                                                        const GtkSourceEncoding *encoding,
+                                                                        const GError            *error);
 
-const GeditEncoding
+const GtkSourceEncoding
                *gedit_conversion_error_info_bar_get_encoding           (GtkWidget           *info_bar);
 
 GtkWidget      *gedit_file_already_open_warning_info_bar_new           (GFile               *location);