pidgin: 3b1db8cf: Don't distribute the MIT Kerberos librar...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 3b1db8cf7e4f877fec5c2f491ff29a079e8034e9
Ancestor: 2113f1ac56e583feda4411886d36d9af5ed1646e
Author: datallah at pidgin.im
Date: 2008-07-30T20:36:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3b1db8cf7e4f877fec5c2f491ff29a079e8034e9

Modified files:
        libpurple/protocols/jabber/libxmpp.c
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

Don't distribute the MIT Kerberos libraries with the win32 build anymore.
Add error popup suppression to avoid the GSSAPI sasl library complaining about
missing dependencies if MIT Kerberos isn't found on the system.
This means that we no longer have to maintain a hacked-together msvcrt-based
build of the MIT kerberos libraries.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/libxmpp.c	37c5d833d44d6b92546bfac621deebad97d7f961
+++ libpurple/protocols/jabber/libxmpp.c	c2d1d7ec1fb55d2eb16df7154e83be9bc19a4d1b
@@ -194,6 +194,7 @@ init_plugin(PurplePlugin *plugin)
 {
 #ifdef HAVE_CYRUS_SASL
 #ifdef _WIN32
+	UINT old_error_mode;
 	gchar *sasldir;
 #endif
 	int ret;
@@ -250,11 +251,17 @@ init_plugin(PurplePlugin *plugin)
 	sasldir = g_build_filename(wpurple_install_dir(), "sasl2", NULL);
 	sasl_set_path(SASL_PATH_TYPE_PLUGIN, sasldir);
 	g_free(sasldir);
+	/* Suppress error popups for failing to load sasl plugins */
+	old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
 #endif
 	if ((ret = sasl_client_init(NULL)) != SASL_OK) {
 		purple_debug_error("xmpp", "Error (%d) initializing SASL.\n", ret);
 	}
+#ifdef _WIN32
+	/* Restore the original error mode */
+	SetErrorMode(old_error_mode);
 #endif
+#endif
 	jabber_register_commands();
 	
 	jabber_iq_init();
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi	e147c56ea0d60bb0848ce0ab1916f3309da4a924
+++ pidgin/win32/nsis/pidgin-installer.nsi	51b2d0d792376a0455061b7382b1c4d35a38aefc
@@ -515,10 +515,6 @@ Section $(PIDGIN_SECTION_TITLE) SecPidgi
       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"