[gedit] Do not use conversion fallback for now.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 79b17f87c45dbaece78e9bf1e3b44a93c430eacb
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Jan 17 19:22:04 2010 +0100

    Do not use conversion fallback for now.
    
    Comment code to not use the conversion fallback. We are still missing
    some things, like the utf8 fallback in gio and manage the wrong chars
    by highlighting them.

 gedit/gedit-gio-document-loader.c     |    5 +++--
 gedit/gedit-smart-charset-converter.c |   16 ++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/gedit/gedit-gio-document-loader.c b/gedit/gedit-gio-document-loader.c
index 22c7c20..80be8d6 100644
--- a/gedit/gedit-gio-document-loader.c
+++ b/gedit/gedit-gio-document-loader.c
@@ -356,7 +356,8 @@ async_read_cb (GInputStream *stream,
 
 		/* Check if we needed some fallback char, if so, check if there was
 		   a previous error and if not set a fallback used error */
-		if ((gedit_smart_charset_converter_get_num_fallbacks (gvloader->priv->converter) != 0) &&
+		/* FIXME Uncomment this when we want to manage conversion fallback */
+		/*if ((gedit_smart_charset_converter_get_num_fallbacks (gvloader->priv->converter) != 0) &&
 		    gvloader->priv->error == NULL)
 		{
 			g_set_error_literal (&gvloader->priv->error,
@@ -364,7 +365,7 @@ async_read_cb (GInputStream *stream,
 					     GEDIT_DOCUMENT_ERROR_CONVERSION_FALLBACK,
 					     "There was a conversion error and it was "
 					     "needed to use a fallback char");
-		}
+		}*/
 
 		end_append_text_to_document (GEDIT_DOCUMENT_LOADER (gvloader));
 
diff --git a/gedit/gedit-smart-charset-converter.c b/gedit/gedit-smart-charset-converter.c
index 6d4c947..593830c 100644
--- a/gedit/gedit-smart-charset-converter.c
+++ b/gedit/gedit-smart-charset-converter.c
@@ -26,6 +26,8 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 
+#include "gedit-convert.h"
+
 #define GEDIT_SMART_CHARSET_CONVERTER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GEDIT_TYPE_SMART_CHARSET_CONVERTER, GeditSmartCharsetConverterPrivate))
 
 struct _GeditSmartCharsetConverterPrivate
@@ -114,11 +116,15 @@ get_encoding (GeditSmartCharsetConverter *smart)
 	if (smart->priv->current_encoding != NULL)
 		return (const GeditEncoding *)smart->priv->current_encoding->data;
 
+#if 0
+	FIXME: uncomment this when using fallback
 	/* If we tried all encodings, we return the first encoding */
 	smart->priv->use_first = TRUE;
 	smart->priv->current_encoding = smart->priv->encodings;
 
 	return (const GeditEncoding *)smart->priv->current_encoding->data;
+#endif
+	return NULL;
 }
 
 static gboolean
@@ -219,6 +225,9 @@ guess_encoding (GeditSmartCharsetConverter *smart,
 			break;
 		}
 
+		gedit_debug_message (DEBUG_UTILS, "trying charset: %s",
+				     gedit_encoding_get_charset (smart->priv->current_encoding->data));
+
 		if (enc == gedit_encoding_get_utf8 ())
 		{
 			gsize remainder;
@@ -262,7 +271,9 @@ guess_encoding (GeditSmartCharsetConverter *smart,
 	if (conv != NULL)
 	{
 		g_converter_reset (G_CONVERTER (conv));
-		g_charset_converter_set_use_fallback (conv, TRUE);
+
+		/* FIXME: uncomment this when we want to use the fallback
+		g_charset_converter_set_use_fallback (conv, TRUE);*/
 	}
 
 	return conv;
@@ -292,7 +303,8 @@ gedit_smart_charset_converter_convert (GConverter *converter,
 		if (smart->priv->charset_conv == NULL &&
 		    !smart->priv->is_utf8)
 		{
-			g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+			/* FIXME: Add a different domain when we kill gedit_convert */
+			g_set_error_literal (error, GEDIT_CONVERT_ERROR, GEDIT_CONVERT_ERROR_AUTO_DETECTION_FAILED,
 					     _("It is not possible to detect the encoding automatically"));
 			return G_CONVERTER_ERROR;
 		}