[Tux4kids-commits] r870 - in tuxtype/trunk: . src

[dbruce-guest at alioth.debian.org]

Author: dbruce-guest
Date: 2009-02-05 13:09:44 +0000 (Thu, 05 Feb 2009)
New Revision: 870

Modified:
   tuxtype/trunk/configure
   tuxtype/trunk/configure.ac
   tuxtype/trunk/src/alphabet.c
Log:
wchar_t utf8 conversion cleanup



Modified: tuxtype/trunk/configure
===================================================================
--- tuxtype/trunk/configure	2009-02-05 04:18:36 UTC (rev 869)
+++ tuxtype/trunk/configure	2009-02-05 13:09:44 UTC (rev 870)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Tux Typing 1.7.3.
+# Generated by GNU Autoconf 2.61 for Tux Typing 1.7.4.
 #
 # Report bugs to <tux4kids-tuxtype-dev at lists.alioth.debian.org>.
 #
@@ -574,8 +574,8 @@
 # Identity of this package.
 PACKAGE_NAME='Tux Typing'
 PACKAGE_TARNAME='tuxtype'
-PACKAGE_VERSION='1.7.3'
-PACKAGE_STRING='Tux Typing 1.7.3'
+PACKAGE_VERSION='1.7.4'
+PACKAGE_STRING='Tux Typing 1.7.4'
 PACKAGE_BUGREPORT='tux4kids-tuxtype-dev at lists.alioth.debian.org'
 
 ac_unique_file="src/playgame.c"
@@ -1286,7 +1286,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Tux Typing 1.7.3 to adapt to many kinds of systems.
+\`configure' configures Tux Typing 1.7.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1357,7 +1357,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Tux Typing 1.7.3:";;
+     short | recursive ) echo "Configuration of Tux Typing 1.7.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1469,7 +1469,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Tux Typing configure 1.7.3
+Tux Typing configure 1.7.4
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1483,7 +1483,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Tux Typing $as_me 1.7.3, which was
+It was created by Tux Typing $as_me 1.7.4, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2307,7 +2307,7 @@
 
 # Define the identity of the package.
  PACKAGE='tuxtype'
- VERSION='1.7.3'
+ VERSION='1.7.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18189,7 +18189,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Tux Typing $as_me 1.7.3, which was
+This file was extended by Tux Typing $as_me 1.7.4, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18242,7 +18242,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Tux Typing config.status 1.7.3
+Tux Typing config.status 1.7.4
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

Modified: tuxtype/trunk/configure.ac
===================================================================
--- tuxtype/trunk/configure.ac	2009-02-05 04:18:36 UTC (rev 869)
+++ tuxtype/trunk/configure.ac	2009-02-05 13:09:44 UTC (rev 870)
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Typing],[1.7.3],[tux4kids-tuxtype-dev at lists.alioth.debian.org],[tuxtype])
+AC_INIT([Tux Typing],[1.7.4],[tux4kids-tuxtype-dev at lists.alioth.debian.org],[tuxtype])
 AC_CONFIG_SRCDIR([src/playgame.c])
 
 AC_PREREQ(2.61)

Modified: tuxtype/trunk/src/alphabet.c
===================================================================
--- tuxtype/trunk/src/alphabet.c	2009-02-05 04:18:36 UTC (rev 869)
+++ tuxtype/trunk/src/alphabet.c	2009-02-05 13:09:44 UTC (rev 870)
@@ -827,11 +827,9 @@
   size_t out_length = (size_t)1024;
 
   DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): wide_word = %S\n", wide_word);}
-//  DEBUGCODE {fprintf(stderr, "ConvertToUTF8(): temp_wchar_t = %S\n", temp_wchar_t);}
 
-  //FIXME we may not need this now that we use pass "wchar_t" rather 
-  //than "UTF-32" in the default case.
-  //Microsoft uses a different wchar_t from the rest of the world - grrr... 
+  /* NOTE although we *should* be just able to pass "wchar_t" as the in_type, */
+  /* iconv_open() segfaults on Windows if this is done - grrr....             */
 #ifdef WIN32
   DEBUGCODE {fprintf(stderr, "WIN32, using UTF-16LE for wchar_t\n");}
   conv_descr = iconv_open("UTF-8", "UTF-16LE");