gnokii ChangeLog common/gsm-encoding.c

[Pawel Kot]

CVSROOT:        /cvsroot/gnokii
Module name:    gnokii
Changes by:     Pawel Kot <pkot>        06/06/17 20:06:17

Modified files:
        .              : ChangeLog 
        common         : gsm-encoding.c 

Log message:
        locale charset win32 problem: return current code page as codeset, also 
makes multibyte-functions work; there is pretty much nothing else that can be 
done to the issue (Jari Turkia)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnokii/ChangeLog?cvsroot=gnokii&r1=1.1197&r2=1.1198
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-encoding.c?cvsroot=gnokii&r1=1.67&r2=1.68

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnokii/gnokii/ChangeLog,v
retrieving revision 1.1197
retrieving revision 1.1198
diff -u -b -r1.1197 -r1.1198
--- ChangeLog   17 Jun 2006 20:00:01 -0000      1.1197
+++ ChangeLog   17 Jun 2006 20:06:17 -0000      1.1198
@@ -52,6 +52,9 @@
       sanely in raw format                              (Pawel Kot)
     o global gnokiirc-file is looked under %SYSTEMROOT%, looking
       from current working directory is a bad idea    (Jari Turkia)
+    o locale charset win32 problem: return current code page as
+      codeset, also makes multibyte-functions work; there is pretty
+      much nothing else that can be done to the issue (Jari Turkia)
  * nk6510 driver updates
     o handle calendar extended parameters writing       (Pawel Kot)
     o support for Symbian phones (identifier 'symbian'), generic

Index: common/gsm-encoding.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/gsm-encoding.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- common/gsm-encoding.c       11 Jun 2006 16:39:48 -0000      1.67
+++ common/gsm-encoding.c       17 Jun 2006 20:06:17 -0000      1.68
@@ -1,6 +1,6 @@
 /*
 
-  $Id: gsm-encoding.c,v 1.67 2006/06/11 16:39:48 deller Exp $
+  $Id: gsm-encoding.c,v 1.68 2006/06/17 20:06:17 pkot Exp $
 
   G N O K I I
 
@@ -116,7 +116,14 @@
 #ifdef HAVE_LANGINFO_CODESET
                codeset = nl_langinfo(CODESET);
 #else
+#  ifdef WIN32
+               /* As suggested by Ben Bryant, 
http://codesnipers.com/?q=node/46 */
+               char szCP[10];
+               sprintf(szCP, ".%d", GetACP());
+               codeset = setlocale(LC_ALL, szCP);
+#  else
                codeset = locale_charset();
+#  endif
 #endif
        }
        return codeset;