[Tux4kids-commits] r1294 - in tuxtype/branches/gsoc-sarah: . data/images data/themes/assamese data/themes/brazilian-portuguese data/themes/brazilian-portuguese/images data/themes/brazilian-portuguese/words data/themes/catalan data/themes/catalan/words data/themes/czech data/themes/czech/words data/themes/dansk data/themes/dansk/sounds data/themes/dansk/words data/themes/deutsch data/themes/deutsch/words data/themes/espanol data/themes/espanol/images data/themes/espanol/words data/themes/euskara data/themes/euskara/images data/themes/euskara/words data/themes/french data/themes/french/words data/themes/greek data/themes/greek/words data/themes/italian data/themes/italian/images data/themes/italian/words data/themes/jamaican data/themes/jamaican/images data/themes/jamaican/words data/themes/lithuanian data/themes/lithuanian/images data/themes/lithuanian/images/status data/themes/lithuanian/sounds data/themes/lithuanian/words data/themes/malayalam data/themes/malayalam/images data/themes/malayalam/images/keyboard data/themes/malayalam/images/status data/themes/nederlands data/themes/nederlands/words data/themes/nynorsk data/themes/nynorsk/images data/themes/nynorsk/images/status data/themes/nynorsk/words data/themes/oriya data/themes/oriya/words data/themes/russian data/themes/russian/images data/themes/russian/images/status data/themes/russian/words data/themes/svenska data/themes/svenska/words data/themes/swahili data/themes/swahili/words data/themes/tamil data/themes/wolof data/themes/wolof/images data/themes/wolof/words data/words doc doc/en src

David Bruce dbruce-guest at alioth.debian.org
Thu Jul 30 16:22:41 UTC 2009


Author: dbruce-guest
Date: 2009-07-30 16:22:41 +0000 (Thu, 30 Jul 2009)
New Revision: 1294

Modified:
   tuxtype/branches/gsoc-sarah/aclocal.m4
   tuxtype/branches/gsoc-sarah/config.h.in~
   tuxtype/branches/gsoc-sarah/data/images/Makefile.am
   tuxtype/branches/gsoc-sarah/data/themes/assamese/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/images/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/catalan/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/catalan/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/czech/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/czech/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/dansk/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/dansk/sounds/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/dansk/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/deutsch/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/deutsch/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/espanol/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/espanol/images/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/espanol/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/euskara/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/euskara/images/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/euskara/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/french/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/french/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/greek/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/greek/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/italian/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/italian/images/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/italian/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/jamaican/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/jamaican/images/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/jamaican/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/lithuanian/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/lithuanian/images/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/lithuanian/images/status/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/lithuanian/sounds/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/lithuanian/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/malayalam/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/keyboard/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/status/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/nederlands/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/nederlands/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/nynorsk/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/nynorsk/images/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/nynorsk/images/status/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/nynorsk/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/oriya/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/oriya/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/russian/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/russian/images/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/russian/images/status/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/russian/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/svenska/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/svenska/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/swahili/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/swahili/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/tamil/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/wolof/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/wolof/images/Makefile.in
   tuxtype/branches/gsoc-sarah/data/themes/wolof/words/Makefile.in
   tuxtype/branches/gsoc-sarah/data/words/Makefile.in
   tuxtype/branches/gsoc-sarah/doc/Makefile.in
   tuxtype/branches/gsoc-sarah/doc/en/Makefile.in
   tuxtype/branches/gsoc-sarah/src/Makefile.in
   tuxtype/branches/gsoc-sarah/src/titlescreen.c
Log:
Start of some fixes to get both fullscreen and windowed modes to draw correctly



Modified: tuxtype/branches/gsoc-sarah/aclocal.m4
===================================================================
--- tuxtype/branches/gsoc-sarah/aclocal.m4	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/aclocal.m4	2009-07-30 16:22:41 UTC (rev 1294)
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+[m4_warning([this file was generated for autoconf 2.64.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])

Modified: tuxtype/branches/gsoc-sarah/config.h.in~
===================================================================
--- tuxtype/branches/gsoc-sarah/config.h.in~	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/config.h.in~	2009-07-30 16:22:41 UTC (rev 1294)
@@ -100,6 +100,9 @@
 /* Define to 1 if you have the <float.h> header file. */
 #undef HAVE_FLOAT_H
 
+/* Define to 1 if you have the `floor' function. */
+#undef HAVE_FLOOR
+
 /* Define to 1 if you have the `fwprintf' function. */
 #undef HAVE_FWPRINTF
 
@@ -173,6 +176,9 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
+/* Define to 1 if you have the `localeconv' function. */
+#undef HAVE_LOCALECONV
+
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
@@ -219,6 +225,9 @@
 /* Define if your printf() function supports format strings with positions. */
 #undef HAVE_POSIX_PRINTF
 
+/* Define to 1 if you have the `pow' function. */
+#undef HAVE_POW
+
 /* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */
 #undef HAVE_PTHREAD_MUTEX_RECURSIVE
 
@@ -231,6 +240,9 @@
 /* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
+/* Define to 1 if you have the `libRSVG` library */
+#undef HAVE_RSVG
+
 /* Define to 1 if you have the `scandir' function. */
 #undef HAVE_SCANDIR
 
@@ -477,6 +489,16 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+#undef _UINT32_T
+
+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+#undef _UINT8_T
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
@@ -496,6 +518,18 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint16_t
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint32_t
+
+/* Define to the type of an unsigned integer type of width exactly 8 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint8_t
+
 /* Define to unsigned long or unsigned long long if <stdint.h> and
    <inttypes.h> don't define. */
 #undef uintmax_t

Modified: tuxtype/branches/gsoc-sarah/data/images/Makefile.am
===================================================================
--- tuxtype/branches/gsoc-sarah/data/images/Makefile.am	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/images/Makefile.am	2009-07-30 16:22:41 UTC (rev 1294)
@@ -65,5 +65,5 @@
   tux2.png \
   tux3.png \
   up.png \
-  wordlist.png \
+##  wordlist.png \
   world.png

Modified: tuxtype/branches/gsoc-sarah/data/themes/assamese/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/assamese/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/assamese/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/images/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/images/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/images/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/brazilian-portuguese/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/catalan/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/catalan/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/catalan/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/catalan/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/catalan/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/catalan/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/czech/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/czech/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/czech/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/czech/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/czech/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/czech/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/dansk/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/dansk/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/dansk/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/dansk/sounds/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/dansk/sounds/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/dansk/sounds/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/dansk/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/dansk/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/dansk/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/deutsch/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/deutsch/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/deutsch/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/deutsch/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/deutsch/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/deutsch/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/espanol/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/espanol/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/espanol/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/espanol/images/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/espanol/images/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/espanol/images/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/espanol/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/espanol/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/espanol/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/euskara/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/euskara/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/euskara/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/euskara/images/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/euskara/images/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/euskara/images/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/euskara/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/euskara/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/euskara/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/french/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/french/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/french/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/french/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/french/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/french/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/greek/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/greek/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/greek/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/greek/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/greek/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/greek/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/italian/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/italian/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/italian/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/italian/images/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/italian/images/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/italian/images/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/italian/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/italian/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/italian/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/jamaican/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/jamaican/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/jamaican/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/jamaican/images/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/jamaican/images/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/jamaican/images/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/jamaican/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/jamaican/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/jamaican/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/lithuanian/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/lithuanian/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/lithuanian/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/lithuanian/images/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/lithuanian/images/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/lithuanian/images/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -138,6 +138,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/lithuanian/images/status/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/lithuanian/images/status/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/lithuanian/images/status/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/lithuanian/sounds/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/lithuanian/sounds/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/lithuanian/sounds/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/lithuanian/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/lithuanian/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/lithuanian/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/malayalam/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/malayalam/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/malayalam/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/keyboard/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/keyboard/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/keyboard/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/status/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/status/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/malayalam/images/status/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/nederlands/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/nederlands/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/nederlands/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/nederlands/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/nederlands/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/nederlands/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/nynorsk/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/nynorsk/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/nynorsk/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/nynorsk/images/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/nynorsk/images/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/nynorsk/images/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/nynorsk/images/status/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/nynorsk/images/status/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/nynorsk/images/status/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/nynorsk/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/nynorsk/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/nynorsk/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/oriya/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/oriya/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/oriya/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/oriya/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/oriya/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/oriya/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/russian/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/russian/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/russian/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/russian/images/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/russian/images/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/russian/images/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/russian/images/status/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/russian/images/status/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/russian/images/status/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/russian/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/russian/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/russian/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/svenska/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/svenska/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/svenska/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/svenska/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/svenska/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/svenska/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/swahili/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/swahili/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/swahili/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/swahili/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/swahili/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/swahili/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/tamil/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/tamil/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/tamil/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/wolof/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/wolof/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/wolof/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/wolof/images/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/wolof/images/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/wolof/images/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/themes/wolof/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/themes/wolof/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/themes/wolof/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/data/words/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/data/words/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/data/words/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/doc/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/doc/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/doc/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -149,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/doc/en/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/doc/en/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/doc/en/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -137,6 +137,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/src/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/src/Makefile.in	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/src/Makefile.in	2009-07-30 16:22:41 UTC (rev 1294)
@@ -164,6 +164,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@

Modified: tuxtype/branches/gsoc-sarah/src/titlescreen.c
===================================================================
--- tuxtype/branches/gsoc-sarah/src/titlescreen.c	2009-07-30 02:27:03 UTC (rev 1293)
+++ tuxtype/branches/gsoc-sarah/src/titlescreen.c	2009-07-30 16:22:41 UTC (rev 1294)
@@ -1553,7 +1553,8 @@
   return 1;
 }
 
-
+/* NOTE this is the page for the user to edit word lists - we */
+/* should come up with a more fitting name for this function. */
 static void ChooseFile(void)
 {
   SDL_Surface* titles[MAX_WORD_LISTS] = {NULL};
@@ -1568,9 +1569,10 @@
   int loc = 0;
   int old_loc = 1;
 
+  //FIXME "themes" as a name doesn't apply here
   int themes = 0;
   int i;
-  char fn[FNLEN];                             
+  char fn[FNLEN];
   char fileNames[MAX_WORD_LISTS][FNLEN];
 
   int old_use_english;
@@ -1580,37 +1582,47 @@
 
   DIR* themesDir = NULL;
   struct dirent* themesFile = NULL;
-                                              
+
+
+
+  /* First we scan the word list directory and create a list of all the */
+  /* files we find there:                                               */
+
+
+  // Set fn to the path for our modifiable word lists:
   sprintf(fn , "%s" , settings.var_data_path);
   fprintf(stderr , "%s", settings.var_data_path);
 
-
   themesDir = opendir(fn);
 
   if (!themesDir)
   {
-    fprintf(stderr, "Choosefile() - cannot open themes directory!");
+    fprintf(stderr, "ChooseFile() - cannot open custom word list directory!");
     return;
   }
 
+  //Copy all the filenames from the word list directory:
   do
   {
     themesFile = readdir(themesDir);
     if (!themesFile)
       break;
 
+    if(themes >= MAX_WORD_LISTS)
+      break;
+
     /* we ignore any hidden file and CVS */
     if (themesFile->d_name[0] == '.') 
       continue;
 
-    if (strcmp("CVS", themesFile->d_name)==0)
+    if (strcmp("CVS", themesFile->d_name) == 0)
       continue;
 
-    sprintf(fn, "%s/%s" , settings.var_data_path, themesFile->d_name); 
+    snprintf(fn, FNLEN, "%s/%s" , settings.var_data_path, themesFile->d_name); 
 
     /* CheckFile() returns 2 if dir, 1 if file, 0 if neither: */
     if (CheckFile(fn) == 1)
-      strncpy( fileNames[themes++], themesFile->d_name, FNLEN-1 );
+      strncpy(fileNames[themes++], themesFile->d_name, FNLEN-1);
     
   } while (1);
   
@@ -1623,35 +1635,44 @@
     select[i] = BlackOutline(fileNames[i], DEFAULT_MENU_FONT_SIZE, &yellow);
   }
  
+
+
+  /* Now we draw the screen: */	
 	
-	
  /* Text and instructions */
 
-	s1 = BlackOutline(gettext_noop("Word List Editor"), 25, &yellow);
-	s2 = BlackOutline(gettext_noop("To add a new wordlist, click the 'New Wordlist' button (it's not there)"), 18, &white);
-	s3 = BlackOutline(gettext_noop("To edit current word lists, either click on the wordlist, or use the arrow keys to navigate and press return"), 18, &white);
-	s4 = BlackOutline(gettext_noop("To exit Word List Editor, press ESC"), 18, &white);	
+  s1 = BlackOutline(gettext_noop("Word List Editor"), 25, &yellow);
+  s2 = BlackOutline(gettext_noop("To add a new wordlist, click the 'New Wordlist' button (it's not there)"), 18, &white);
+  s3 = BlackOutline(gettext_noop("To edit current word lists, either click on the wordlist, or use the arrow keys to navigate and press return"), 18, &white);
+  s4 = BlackOutline(gettext_noop("To exit Word List Editor, press ESC"), 18, &white);	
 
+  picture = LoadImage("NewWordList.png", IMG_ALPHA);
+  LOG( "ChooseFile() - drawing screen\n");
 
-	picture = LoadImage("NewWordList.png", IMG_ALPHA);
-	LOG( "ChooseFile() - drawing screen\n");
 	
-	SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);
-    locText.x = screen->w/2 - (s1->w/2); locText.y = 10;
-    SDL_BlitSurface( s1, NULL, screen, &locText);
-    locText.x = screen->w/2 - (s2->w/2); locText.y = 60;
-    SDL_BlitSurface( s2, NULL, screen, &locText);
-    locText.x = screen->w/2 - (s3->w/2); locText.y = 90;
-    SDL_BlitSurface(s3, NULL, screen, &locText);
-    locText.x = screen->w/2 - (s4->w/2); locText.y = 120;
-    SDL_BlitSurface( s4, NULL, screen, &locText);
-	 locText.x = screen->w/3 * 2; locText.y = 200;
-	SDL_BlitSurface( picture, NULL, screen, &locText);
+  /* FIXME we should test all the SDL_Surface* pointers to be sure     */
+  /* they aren't NULL before we try to blit them so we don't segfault. */
+  SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);
 
+  locText.x = screen->w/2 - (s1->w/2); locText.y = 10;
+  SDL_BlitSurface( s1, NULL, screen, &locText);
+
+  locText.x = screen->w/2 - (s2->w/2); locText.y = 60;
+  SDL_BlitSurface( s2, NULL, screen, &locText);
+
+  locText.x = screen->w/2 - (s3->w/2); locText.y = 90;
+  SDL_BlitSurface(s3, NULL, screen, &locText);
+
+  locText.x = screen->w/2 - (s4->w/2); locText.y = 120;
+  SDL_BlitSurface( s4, NULL, screen, &locText);
+
+  locText.x = screen->w/3 * 2; locText.y = 200;
+  SDL_BlitSurface( picture, NULL, screen, &locText);
+
+  // Trigger refresh of entire screen:	
+  SDL_UpdateRect(screen, 0, 0, 0, 0);
 	
-    SDL_UpdateRect(screen, 0, 0, 0, 0);
 	
-	
 
 
   /* set initial rect sizes */
@@ -1666,6 +1687,7 @@
 	titleRects[i].x = screen->w /2;
   }
 
+
   while (!stop)
   {
     while (SDL_PollEvent(&event))
@@ -1741,7 +1763,7 @@
     {
       int start;
 
-      SDL_BlitSurface( bkg, NULL, screen, NULL );
+//      SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL );
 
       //if (loc) SetupPaths(fileNames[loc]); else SetupPaths(NULL);
 
@@ -1754,8 +1776,9 @@
           SDL_BlitSurface(select[loc], NULL, screen, &titleRects[i % 8]);
         else
           SDL_BlitSurface(titles[i], NULL, screen, &titleRects[i % 8]);
-		 SDL_BlitSurface(CurrentBkgd(), &locText, screen, &locText);
-		SDL_UpdateRect(screen, locText.x, locText.y, locText.w, locText.h);
+
+        SDL_BlitSurface(CurrentBkgd(), &locText, screen, &locText);
+//        SDL_UpdateRect(screen, locText.x, locText.y, locText.w, locText.h);
       }
 
       SDL_UpdateRect(screen, 0, 0, 0 ,0);
@@ -1786,6 +1809,8 @@
 }
 
 
+
+/* Need better descriptive name for this function - EditWords() or such */
 static void ChooseWord(char *words_file)
 {
 	/* Need to figure out how to handle empty lists */
@@ -1793,7 +1818,7 @@
   static SDL_Surface* select[MAX_WORD_LISTS] = {NULL};
   static SDL_Surface *left = NULL, *right = NULL;
   static SDL_Rect leftRect, rightRect;
-  SDL_Surface* bkg = NULL;
+//  SDL_Surface* bkg = NULL;
   SDL_Rect titleRects[8];
   int stop = 0;
   int loc = 0;
@@ -1833,8 +1858,8 @@
     select[i] = BlackOutline(words_in_list[i], DEFAULT_MENU_FONT_SIZE, &yellow);
   }
 
-  bkg = LoadImage("main_bkg.png", IMG_REGULAR);
-	 SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);	
+//  bkg = LoadImage("main_bkg.png", IMG_REGULAR);
+//	 SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);	
 
   left = LoadImage("left.png", IMG_ALPHA);
   leftRect.w = left->w; leftRect.h = left->h;
@@ -2024,7 +2049,7 @@
 
     if(!stop)
     {
-      SDL_BlitSurface( bkg, NULL, screen, NULL );
+      SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL );
 
 //	if (loc) SetupPaths(fileNames[loc]); else SetupPaths(NULL);	
 
@@ -2086,10 +2111,10 @@
     SDL_FreeSurface(select[i]);
   }
 
-  SDL_FreeSurface(bkg);
+//  SDL_FreeSurface(bkg);
   SDL_FreeSurface(left);
   SDL_FreeSurface(right);
-  bkg = NULL;  /* the other pointers are going out of scope so we don't */
+//  bkg = NULL;  /* the other pointers are going out of scope so we don't */
                /* have to worry about setting them to NULL              */
 }              
 




More information about the Tux4kids-commits mailing list