[grisbi-cvs] grisbi/src utils_files.c,1.50,1.51

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17086

Modified Files:
	utils_files.c 
Log Message:
fixed bug 934 check feedback for this bug

Index: utils_files.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_files.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- utils_files.c	23 Jan 2010 13:46:13 -0000	1.50
+++ utils_files.c	6 Feb 2010 10:02:50 -0000	1.51
@@ -84,6 +84,11 @@
     "IBM850"};
 
 static gchar *all_charset_array[] = {
+    "IBM850",
+    "ISO-8859-1",
+    "ISO-8859-15",
+    "x-mac-roman",
+    "windows-1252",
     "IBM864",
     "IBM864i",
     "ISO-8859-6",
@@ -159,12 +164,7 @@
     "VISCII",
     "x-viet-vps",
     "windows-1258",
-    "ISO-8859-8",
-    "IBM850",
-    "ISO-8859-1",
-    "ISO-8859-15",
-    "x-mac-roman",
-    "windows-1252"};
+    "ISO-8859-8"};
 
 /**
  * Handler triggered by clicking on the button of a "print to file"
@@ -547,7 +547,7 @@
 
             string = g_strndup ( ptr, ( ( ptr_tmp ) - ptr ) );
             if ( ( ptr_r = g_strrstr ( string, "\r" ) ) )
-                ptr_r = '\0';
+                ptr_r[0] = '\0';
 
             if ( g_convert ( string, -1, "UTF-8", coding_system, NULL, NULL, NULL ) == NULL )
             {
@@ -868,7 +868,7 @@
 
             string = g_strndup ( ptr, ( ( ptr_tmp ) - ptr ) );
             if ( ( ptr_r = g_strrstr ( string, "\r" ) ) )
-                ptr_r = '\0';
+                ptr_r[0] = '\0';
 
             if ( ( tmp_str = g_strrstr ( string, "CHARSET:" ) ) )
             {