Mercurial > pidgin
changeset 32743:8404c5b75e99
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 09d2e29b6ff4dcc675099f74645ca2eb119ad6b5)
to branch 'im.pidgin.pidgin' (head 607e111e6c0089eb2b27a1046427c3688ee4424b)
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 10 Mar 2012 05:27:17 +0000 |
| parents | 4a8f81812ba3 (diff) 2efee7ca90be (current diff) |
| children | dded40d8a62c |
| files | ChangeLog gaim-uninstalled.pc.in gaim.pc.in libpurple/gaim-compat.h libpurple/plugins/autoaccept.c libpurple/protocols/silc10/Makefile.am libpurple/protocols/silc10/Makefile.mingw libpurple/protocols/silc10/README libpurple/protocols/silc10/TODO libpurple/protocols/silc10/buddy.c libpurple/protocols/silc10/chat.c libpurple/protocols/silc10/ft.c libpurple/protocols/silc10/ops.c libpurple/protocols/silc10/pk.c libpurple/protocols/silc10/silc.c libpurple/protocols/silc10/silcpurple.h libpurple/protocols/silc10/util.c libpurple/protocols/silc10/wb.c libpurple/protocols/silc10/wb.h libpurple/purple-2-uninstalled.pc.in libpurple/purple-2.pc.in libpurple/purple-uninstalled.pc.in libpurple/purple.pc.in pidgin/gtkdocklet-gtk.c pidgin/gtkgaim-compat.h pidgin/gtkprefs.c pidgin/pidgin-2-uninstalled.pc.in pidgin/pidgin-2.pc.in pidgin/pidgin-uninstalled.pc.in pidgin/pidgin.pc.in |
| diffstat | 5 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Mar 04 03:49:49 2012 +0000 +++ b/ChangeLog Sat Mar 10 05:27:17 2012 +0000 @@ -59,6 +59,8 @@ (Dan Williams) (#13859) AIM and ICQ: + * Fix a possible crash when receiving an unexpected message + from the server. (Thijs Alkemade) (#14983) * Allow signing on with usernames containing periods and underscores. (#13500) * Allow adding buddies containing periods and underscores. (#13500) @@ -72,6 +74,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/Makefile.mingw Sun Mar 04 03:49:49 2012 +0000 +++ b/Makefile.mingw Sat Mar 10 05:27:17 2012 +0000 @@ -139,11 +139,11 @@ -exec $(STRIP) --strip-unneeded {} ';' installer: generate_installer_includes - $(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi + $(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" -DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./ installer_offline: generate_installer_includes - $(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DOFFLINE_INSTALLER $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi + $(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" -DOFFLINE_INSTALLER -DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe ./ installer_zip: create_release_install_dir
--- a/libpurple/protocols/oscar/family_icq.c Sun Mar 04 03:49:49 2012 +0000 +++ b/libpurple/protocols/oscar/family_icq.c Sat Mar 10 05:27:17 2012 +0000 @@ -91,7 +91,6 @@ request_type = original_snac->data; original_info_ptr = g_slist_find_custom(od->icq_info, &original_snac->id, compare_icq_infos); - original_info = original_info_ptr->data; if (!original_info_ptr) { purple_debug_misc("oscar", "icq: the request info for the error packet was not found"); @@ -99,6 +98,8 @@ return 0; } + original_info = original_info_ptr->data; + reason = byte_stream_get16(bs); uin = g_strdup_printf("%u", original_info->uin); switch (*request_type) {
--- a/libpurple/win32/global.mak Sun Mar 04 03:49:49 2012 +0000 +++ b/libpurple/win32/global.mak Sat Mar 10 05:27:17 2012 +0000 @@ -102,7 +102,6 @@ endif GMSGFMT ?= $(WIN32_DEV_TOP)/gettext-0.17/bin/msgfmt MAKENSIS ?= makensis.exe -MAKENSISOPT ?= / PERL ?= perl WINDRES ?= windres STRIP ?= strip
--- a/pidgin/win32/nsis/pidgin-installer.nsi Sun Mar 04 03:49:49 2012 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Sat Mar 10 05:27:17 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}>k_version=${GTK_INSTALL_VERSION}&dl_pkg=gtk" + StrCpy $R2 "${DOWNLOADER_URL}>k_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"