pidgin.2.x.y: 90fa151a: Update the win32 spellcheck downloading ...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 90fa151abc22265213ed484f5c93cbe132776126
Parent:   b519762318ffa47d688c4bcfc847b5a38a7a5f2a
Author:   datallah at pidgin.im
Date:     02/28/12 22:15:39
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/90fa151abc22265213ed484f5c93cbe132776126

Changelog: 

Update the win32 spellcheck downloading to go through the redirector php script
on pidgin.im.  Currently this will just forward to a oo.o mirror that still has
the dictionaries available, but it also gives us the flexibility handle such
situations better in the future.

Fixes #14612

Changes against parent b519762318ffa47d688c4bcfc847b5a38a7a5f2a

  patched  ChangeLog
  patched  pidgin/win32/nsis/pidgin-installer.nsi

-------------- next part --------------
============================================================
--- ChangeLog	23aace224ee6695ea8b535eed5b9cb7c2cd222d8
+++ ChangeLog	31d9c10707c7e4d320ee2744c563ee1cfd5ac36a
@@ -29,6 +29,7 @@ version 2.10.2 (02/22/2012):
 	* Fix messages to offline contacts. (#14302)
 
 	Windows-Specific Changes:
+	* Fix the installer downloading of spell-checking dictionaries (#14612)
 	* Fix compilation of the Bonjour protocol plugin. (#14802)
 
 	Plugins:
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi	fceb47726f4bd47638ef3920830f8fb40e911468
+++ pidgin/win32/nsis/pidgin-installer.nsi	29d8dc7369f0e3cdf923a40ade33ac7628690241
@@ -71,8 +71,7 @@ RequestExecutionLevel highest
 !define PERL_REG_KEY				"SOFTWARE\Perl"
 !define PERL_DLL				"perl510.dll"
 
-!define DOWNLOADER_URL				"http://pidgin.im/win32/download_redir.php"
-!define SPELL_DOWNLOAD_URL			"http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries"
+!define DOWNLOADER_URL				"http://pidgin.im/win32/download_redir.php?version=${PIDGIN_VERSION}"
 
 !define MEMENTO_REGISTRY_ROOT			HKLM
 !define MEMENTO_REGISTRY_KEY			"${PIDGIN_UNINSTALL_KEY}"
@@ -264,7 +263,7 @@ Section $(GTKSECTIONTITLE) SecGtk
 
   ; We need to download the GTK+ runtime
   retry:
-  StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&gtk_version=${GTK_INSTALL_VERSION}&dl_pkg=gtk"
+  StrCpy $R2 "${DOWNLOADER_URL}&gtk_version=${GTK_INSTALL_VERSION}&dl_pkg=gtk"
   DetailPrint "Downloading GTK+ Runtime ... ($R2)"
   NSISdl::download /TIMEOUT=10000 $R2 $R1
   Pop $R0
@@ -463,7 +462,7 @@ Section /o $(DEBUGSYMBOLSSECTIONTITLE) S
 
   ; We need to download the debug symbols
   retry:
-  StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=dbgsym"
+  StrCpy $R2 "${DOWNLOADER_URL}&dl_pkg=dbgsym"
   DetailPrint "Downloading Debug Symbols... ($R2)"
   NSISdl::download /TIMEOUT=10000 $R2 $R1
   Pop $R0
@@ -1274,7 +1273,7 @@ Function InstallDict
 
   ; We need to download and install dictionary
   StrCpy $R2 "$PLUGINSDIR\$R1"
-  StrCpy $R3 "${SPELL_DOWNLOAD_URL}/$R1"
+  StrCpy $R3 "${DOWNLOADER_URL}&dl_pkg=oo_dict&lang=$R1&lang_file=$R1"
   DetailPrint "Downloading the $R0 Dictionary... ($R3)"
   retry:
   NSISdl::download /TIMEOUT=10000 "$R3" "$R2"