diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2008-07-30 20:36:18 +0000 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2008-07-30 20:36:18 +0000 |
| commit | 2de033b1b52138f6c1db80fff81cfcbec5d75b12 (patch) | |
| tree | e46ea0d49015fedee62586c93ee73979051e0c7a | |
| parent | 7001c8fcbb24be761262261f9465eeab5ba3838b (diff) | |
| download | pidgin-2de033b1b52138f6c1db80fff81cfcbec5d75b12.tar.gz | |
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.
| -rw-r--r-- | libpurple/protocols/jabber/libxmpp.c | 7 | ||||
| -rw-r--r-- | pidgin/win32/nsis/pidgin-installer.nsi | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c index 2db847c019..dd81c2c0a9 100644 --- a/libpurple/protocols/jabber/libxmpp.c +++ b/libpurple/protocols/jabber/libxmpp.c @@ -194,6 +194,7 @@ init_plugin(PurplePlugin *plugin) { #ifdef HAVE_CYRUS_SASL #ifdef _WIN32 + UINT old_error_mode; gchar *sasldir; #endif int ret; @@ -250,10 +251,16 @@ 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(); diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi index a4071faae2..c219a33ca8 100644 --- a/pidgin/win32/nsis/pidgin-installer.nsi +++ b/pidgin/win32/nsis/pidgin-installer.nsi @@ -515,10 +515,6 @@ Section $(PIDGIN_SECTION_TITLE) SecPidgin 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" |