=== WARNING THIS PATCH SET HAS BEEN REVERTED ===

	autotools croos compilation with mingw32
	use glib headers instead of glibc (g_mkdir, g_unlink, g_stat)
	NEED MORE WORK. cvs maybe broken now.

	* Makefile.am:
	* acinclude.m4:
	* configure.in:
	* cross-configure.sh: script to run configure. Look variables.
	* po/Makefile.in.in:
	* src/boards/Makefile.am:
	* src/boards/gtans.c:
	* src/boards/gtans_support.c: (check_file_exists):
	* src/boards/py-mod-gcompris.c: (py_gcompris_child_watch_add),
	(py_gcompris_spawn_async):
	* src/gcompris/Makefile.am:
	* src/gcompris/binreloc.c: (_br_find_exe):
	* src/gcompris/board.c:
	* src/gcompris/board.h:
	* src/gcompris/file_selector.c: (parse_doc):
	* src/gcompris/gameutil.c: (gc_util_create_rootdir):
	* src/gcompris/gcompris.c: (activation_done), (gc_init):
	* src/gcompris/gcompris_db.c: (gc_db_init):
	* src/gcompris/images_selector.c: (parse_doc):
	* src/gcompris/menu.c: (gc_menu_load):
	* src/gcompris/properties.c: (gc_prop_new):
	* src/gcompris/sdlplayer.c: (errorv):
	* src/gcompris/soundutil.c:

1 files changed, 23 insertions, 25 deletions

diff --git a/gcompris-installer.nsi.in b/gcompris-installer.nsi.in
index 49ab163..1c662fa 100644
--- a/gcompris-installer.nsi.in
+++ b/gcompris-installer.nsi.in
@@ -215,32 +215,27 @@ Section -SecUninstallOldGcompris
       StrCmp $R2 "" uninstall_problem
         ; Check if we have uninstall string..
         IfFileExists $R3 0 uninstall_problem
-          ; Have uninstall string.. go ahead and uninstall.
 
-	  ; In this case just wipe out previous Gcompris install dir..
-	  ; We get here because versions 0.60a1 and 0.60a2 don't have versions set in the registry
-	  ; and versions 0.60 and lower did not correctly set the uninstall reg string
-	  ; (the string was set in quotes)
-          MessageBox MB_YESNO $(GCOMPRIS_PROMPT_WIPEOUT) IDYES do_wipeout IDNO cancel_install
-          cancel_install:
-            Quit
+          MessageBox MB_YESNO "Uninstall your previous version of GCompris?" IDYES do_uninstall IDNO done
+
+          do_uninstall:
+	    ; Have uninstall string.. go ahead and uninstall.
+	    SetOverwrite on
+	    ; Need to copy uninstaller outside of the install dir
+	    ClearErrors
+	    CopyFiles /SILENT $R3 "$TEMP\${GCOMPRIS_UNINST_EXE}"
+	    SetOverwrite off
+	    IfErrors uninstall_problem
+	      ; Ready to uninstall..
+	      ClearErrors
+	      ExecWait '"$TEMP\${GCOMPRIS_UNINST_EXE}" /S _?=$R1'
+	      IfErrors exec_error
+		Delete "$TEMP\${GCOMPRIS_UNINST_EXE}"
+		Goto done
 
-          SetOverwrite on
-          ; Need to copy uninstaller outside of the install dir
-          ClearErrors
-          CopyFiles /SILENT $R3 "$TEMP\${GCOMPRIS_UNINST_EXE}"
-          SetOverwrite off
-          IfErrors uninstall_problem
-            ; Ready to uninstall..
-            ClearErrors
-	    ExecWait '"$TEMP\${GCOMPRIS_UNINST_EXE}" /S _?=$R1'
-	    IfErrors exec_error
-              Delete "$TEMP\${GCOMPRIS_UNINST_EXE}"
-	      Goto done
-
-	    exec_error:
-              Delete "$TEMP\${GCOMPRIS_UNINST_EXE}"
-              Goto uninstall_problem
+	      exec_error:
+		Delete "$TEMP\${GCOMPRIS_UNINST_EXE}"
+		Goto uninstall_problem
 
         uninstall_problem:
 	  ; In this case just wipe out previous Gcompris install dir..
@@ -248,7 +243,9 @@ Section -SecUninstallOldGcompris
 	  ; and versions 0.60 and lower did not correctly set the uninstall reg string
 	  ; (the string was set in quotes)
           IfSilent do_wipeout
-          MessageBox MB_YESNO "Uninstall previous version?" IDYES do_wipeout IDNO done
+          MessageBox MB_YESNO $(GCOMPRIS_PROMPT_WIPEOUT) IDYES do_wipeout IDNO cancel_install
+          cancel_install:
+            Quit
 
           do_wipeout:
             StrCmp $R0 "HKLM" gcompris_del_lm_reg gcompris_del_cu_reg
@@ -431,6 +428,7 @@ Section Uninstall
     Delete "$INSTDIR\pangocairo.pyd"
     Delete "$INSTDIR\popt1.dll"
     Delete "$INSTDIR\pthreadGC.dll"
+    Delete "$INSTDIR\python24.dll"
     Delete "$INSTDIR\python24.zip"
     Delete "$INSTDIR\select.pyd"
     Delete "$INSTDIR\setup.py"