/pidgin/main: 213ea319f7cd: Update silc to 1.1.10 in the win32 b...

[Daniel Atallah]

Changeset: 213ea319f7cd9219fadff41acc49c6873c76637c
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2012-08-27 16:09 +0100
Branch:	 release-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/213ea319f7cd

Description:

Update silc to 1.1.10 in the win32 build. Refs #15286

diffstat:

 libpurple/protocols/silc/Makefile.mingw |  2 +-
 libpurple/win32/global.mak              |  2 +-
 pidgin/win32/nsis/pidgin-installer.nsi  |  4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diffs (45 lines):

diff --git a/libpurple/protocols/silc/Makefile.mingw b/libpurple/protocols/silc/Makefile.mingw
--- a/libpurple/protocols/silc/Makefile.mingw
+++ b/libpurple/protocols/silc/Makefile.mingw
@@ -11,7 +11,7 @@ DEFINES := $(subst -DWIN32_LEAN_AND_MEAN
 
 TARGET = libsilc
 NEEDED_DLLS =		$(SILC_TOOLKIT)/bin/libsilc-1-1-2.dll \
-			$(SILC_TOOLKIT)/bin/libsilcclient-1-1-2.dll
+			$(SILC_TOOLKIT)/bin/libsilcclient-1-1-3.dll
 TYPE = PLUGIN
 
 # Static or Plugin...
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -19,7 +19,7 @@ LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-
 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa2
 NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.12.5-nspr-4.8.2
 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
-SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.8
+SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
 GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13
 
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -360,7 +360,7 @@ Section $(PIDGINSECTIONTITLE) SecPidgin
     ${AndIf} ${IsWinNT4}
       ;SILC
       Delete "$INSTDIR\plugins\libsilc.dll"
-      Delete "$INSTDIR\libsilcclient-1-1-2.dll"
+      Delete "$INSTDIR\libsilcclient-1-1-3.dll"
       Delete "$INSTDIR\libsilc-1-1-2.dll"
       ;GSSAPI
       Delete "$INSTDIR\sasl2\saslGSSAPI.dll"
@@ -637,7 +637,7 @@ Section Uninstall
     Delete "$INSTDIR\libpurple.dll"
     Delete "$INSTDIR\libsasl.dll"
     Delete "$INSTDIR\libsilc-1-1-2.dll"
-    Delete "$INSTDIR\libsilcclient-1-1-2.dll"
+    Delete "$INSTDIR\libsilcclient-1-1-3.dll"
     Delete "$INSTDIR\libxml2-2.dll"
     Delete "$INSTDIR\libymsg.dll"
     Delete "$INSTDIR\nss3.dll"