nemiver r878 - in trunk: . src/persp/dbgperspective

[dodji svn gnome org]

Author: dodji
Date: Sat Jun 28 18:22:09 2008
New Revision: 878
URL: http://svn.gnome.org/viewvc/nemiver?rev=878&view=rev

Log:
properly fallback to hardcoded file encoding lists when necessary

	* src/persp/dbgperspective/nmv-dbg-perspective.cc:
	  (DBGPerspective::Priv::ensure_buffer_is_in_utf8): make sure to try
	  hardcoded file encodings when the encodings listed in gconf are not
	  enough.


Modified:
   trunk/ChangeLog
   trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc

Modified: trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc	Sat Jun 28 18:22:09 2008
@@ -917,7 +917,9 @@
                 converted = true;
                 break;
             }
-        } else {
+        }
+
+        if (!converted) {
             //fall back to trying the hardcoded list of supported encodings
             LOG_DD ("trying hardcoded encodings");
             for (unsigned int i=0; i < SIZE_OF_SUPPORTED_ENCODINGS; i++) {