Mercurial > pidgin.yaz
changeset 23668:c014c3fe0de9
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.
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 30 Jul 2008 20:36:18 +0000 |
| parents | bd789c20f577 |
| children | 85189641a970 |
| files | libpurple/protocols/jabber/libxmpp.c pidgin/win32/nsis/pidgin-installer.nsi |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/libxmpp.c Wed Jul 30 20:22:22 2008 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Wed Jul 30 20:36:18 2008 +0000 @@ -194,6 +194,7 @@ { #ifdef HAVE_CYRUS_SASL #ifdef _WIN32 + UINT old_error_mode; gchar *sasldir; #endif int ret; @@ -250,10 +251,16 @@ 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();
--- a/pidgin/win32/nsis/pidgin-installer.nsi Wed Jul 30 20:22:22 2008 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Wed Jul 30 20:36:18 2008 +0000 @@ -515,10 +515,6 @@ 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"