[gedit] Adapt for gtk_source_file_get_encoding() NULL return value

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

commit e5234e6210f327523ca8b9c450d1c54bec7a1031
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Aug 10 17:43:47 2014 +0200

    Adapt for gtk_source_file_get_encoding() NULL return value
    
    NULL can now be returned.

 gedit/gedit-commands-file.c |    6 +++++-
 gedit/gedit-document.c      |    6 ++++++
 gedit/gedit-tab.c           |    8 +++++---
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index 748cca4..3e8d99e 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -901,7 +901,11 @@ _gedit_cmd_file_save_as_tab (GeditTab    *tab,
 
        /* Set suggested encoding */
        encoding = gtk_source_file_get_encoding (file);
-       g_return_if_fail (encoding != NULL);
+
+       if (encoding == NULL)
+       {
+               encoding = gtk_source_encoding_get_utf8 ();
+       }
 
        newline_type = gtk_source_file_get_newline_type (file);
 
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 36a8101..8cb8365 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -549,6 +549,12 @@ save_encoding_metadata (GeditDocument *doc)
        gedit_debug (DEBUG_DOCUMENT);
 
        encoding = gtk_source_file_get_encoding (doc->priv->file);
+
+       if (encoding == NULL)
+       {
+               encoding = gtk_source_encoding_get_utf8 ();
+       }
+
        charset = gtk_source_encoding_get_charset (encoding);
 
        gedit_document_set_metadata (doc,
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index 0805baa..0ec789c 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -1520,9 +1520,11 @@ _gedit_tab_get_tooltip (GeditTab *tab)
                        enc = gtk_source_file_get_encoding (file);
 
                        if (enc == NULL)
-                               encoding = g_strdup (_("Unicode (UTF-8)"));
-                       else
-                               encoding = gtk_source_encoding_to_string (enc);
+                       {
+                               enc = gtk_source_encoding_get_utf8 ();
+                       }
+
+                       encoding = gtk_source_encoding_to_string (enc);
 
                        tip =  g_markup_printf_escaped ("<b>%s</b> %s\n\n"
                                                        "<b>%s</b> %s\n"