changeset 23587:1452c89e7f05

Don't install the GSSAPI SASL plugin on NT4 as it isn't compatible. Fixes #6399.
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 23 Jul 2008 00:35:30 +0000
parents ad7f01935fa4
children 3ec514b98728
files ChangeLog.win32 pidgin/win32/nsis/pidgin-installer.nsi
diffstat 2 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.win32	Tue Jul 22 14:13:58 2008 +0000
+++ b/ChangeLog.win32	Wed Jul 23 00:35:30 2008 +0000
@@ -1,3 +1,6 @@
+version 2.5.0 (??/??/2008):
+	* Don't install the GSSAPI SASL plugin on NT4 to avoid an error popup.
+
 version 2.4.3 (07/01/2008):
 	* No changes
 
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Tue Jul 22 14:13:58 2008 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Wed Jul 23 00:35:30 2008 +0000
@@ -505,11 +505,20 @@
     ; If this is under NT4, delete the SILC support stuff
     ; there is a bug that will prevent any account from connecting
     ; See https://lists.silcnet.org/pipermail/silc-devel/2005-January/001588.html
+    ; Also, remove the GSSAPI SASL plugin and associated files as they aren't
+    ; compatible with NT4.
     ${If} ${IsNT}
     ${AndIf} ${IsWinNT4}
+      ;SILC
       Delete "$INSTDIR\plugins\libsilc.dll"
       Delete "$INSTDIR\libsilcclient-1-1-2.dll"
       Delete "$INSTDIR\libsilc-1-1-2.dll"
+      ;GSSAPI
+      Delete "$INSTDIR\sasl2\saslGSSAPI.dll"
+      Delete "$INSTDIR\gssapi32.dll"
+      Delete "$INSTDIR\k5sprt32.dll"
+      Delete "$INSTDIR\krb5_32.dll"
+      Delete "$INSTDIR\comerr32.dll"
     ${EndIf}
 
     SetOutPath "$INSTDIR"