# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1188361853 0
# Node ID 9683da821d157d2f6a368594300f0c4d8a547583
# Parent  759273051b266315878746eee0ae7260254ff5dc
Upgrade the win32 build to use version 1.1.2 of the SILC toolkit.

diff -r 759273051b26 -r 9683da821d15 ChangeLog.win32
--- a/ChangeLog.win32	Wed Aug 29 04:21:33 2007 +0000
+++ b/ChangeLog.win32	Wed Aug 29 04:30:53 2007 +0000
@@ -1,5 +1,8 @@
+version 2.2.0 (??/??/2007):
+	* Upgrade SILC to use the 1.1.2 toolkit
+
 version 2.1.1 (08/20/2007):
-        * No changes
+	* No changes
 
 version 2.1.0 (7/28/2007):
 	* Updated launcher application (pidgin.exe) to support portable mode
diff -r 759273051b26 -r 9683da821d15 libpurple/protocols/Makefile.mingw
--- a/libpurple/protocols/Makefile.mingw	Wed Aug 29 04:21:33 2007 +0000
+++ b/libpurple/protocols/Makefile.mingw	Wed Aug 29 04:30:53 2007 +0000
@@ -8,7 +8,7 @@
 PIDGIN_TREE_TOP := ../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
-SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc10 simple yahoo bonjour myspace
+SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc simple yahoo bonjour myspace
 
 .PHONY: all install clean
 
diff -r 759273051b26 -r 9683da821d15 libpurple/protocols/silc/Makefile.mingw
--- a/libpurple/protocols/silc/Makefile.mingw	Wed Aug 29 04:21:33 2007 +0000
+++ b/libpurple/protocols/silc/Makefile.mingw	Wed Aug 29 04:30:53 2007 +0000
@@ -8,8 +8,8 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libsilc
-NEEDED_DLLS =		$(SILC_TOOLKIT)/lib/silc.dll \
-			$(SILC_TOOLKIT)/lib/silcclient.dll
+NEEDED_DLLS =		$(SILC_TOOLKIT)/bin/libsilc-1-1-2.dll \
+			$(SILC_TOOLKIT)/bin/libsilcclient-1-1-2.dll
 TYPE = PLUGIN
 
 # Static or Plugin...
diff -r 759273051b26 -r 9683da821d15 libpurple/protocols/silc/silc.c
--- a/libpurple/protocols/silc/silc.c	Wed Aug 29 04:21:33 2007 +0000
+++ b/libpurple/protocols/silc/silc.c	Wed Aug 29 04:30:53 2007 +0000
@@ -1975,9 +1975,6 @@
 silc_log_set_debug_string("*client*");
 #endif
 
-#ifdef _WIN32
-	silc_net_win32_init();
-#endif
 }
 
 PURPLE_INIT_PLUGIN(silc, init_plugin, info);
diff -r 759273051b26 -r 9683da821d15 libpurple/win32/global.mak
--- a/libpurple/win32/global.mak	Wed Aug 29 04:21:33 2007 +0000
+++ b/libpurple/win32/global.mak	Wed Aug 29 04:30:53 2007 +0000
@@ -20,7 +20,7 @@
 NSPR_TOP ?= $(WIN32_DEV_TOP)/nspr-4.6.4
 NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.11.4
 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl58
-SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.0.2
+SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.2
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
 
 # Where we installing this stuff to?
diff -r 759273051b26 -r 9683da821d15 pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Wed Aug 29 04:21:33 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Wed Aug 29 04:30:53 2007 +0000
@@ -503,8 +503,8 @@
     ${If} ${IsNT}
     ${AndIf} ${IsWinNT4}
       Delete "$INSTDIR\plugins\libsilc.dll"
-      Delete "$INSTDIR\silcclient.dll"
-      Delete "$INSTDIR\silc.dll"
+      Delete "$INSTDIR\libsilcclient-1-1-2.dll"
+      Delete "$INSTDIR\libsilc-1-1-2.dll"
     ${EndIf}
 
     SetOutPath "$INSTDIR"
@@ -764,8 +764,8 @@
     Delete "$INSTDIR\pidgin.dll"
     Delete "$INSTDIR\plc4.dll"
     Delete "$INSTDIR\plds4.dll"
-    Delete "$INSTDIR\silc.dll"
-    Delete "$INSTDIR\silcclient.dll"
+    Delete "$INSTDIR\libsilc-1-1-2.dll"
+    Delete "$INSTDIR\libsilcclient-1-1-2.dll"
     Delete "$INSTDIR\smime3.dll"
     Delete "$INSTDIR\softokn3.dll"
     Delete "$INSTDIR\ssl3.dll"