Mercurial > pidgin

changeset 32741:07b3035b4319

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 29 Feb 2012 03:15:39 +0000
parents 200a6032d8ec
children 4a8f81812ba3
files ChangeLog pidgin/win32/nsis/pidgin-installer.nsi
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Feb 28 22:41:57 2012 +0000
+++ b/ChangeLog	Wed Feb 29 03:15:39 2012 +0000
@@ -29,6 +29,7 @@
 	* 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:
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Tue Feb 28 22:41:57 2012 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Wed Feb 29 03:15:39 2012 +0000
@@ -71,8 +71,7 @@
 !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 @@
 
   ; 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 @@
 
   ; 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 @@
 
   ; 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"