Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/libxmpp.c @ 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 | 10382f1e1353 |
children | 1de1494a13e5 b4ec5481a67a ba362a67278c 4bc74deeb503 |
comparison
equal
deleted
inserted
replaced
23667:bd789c20f577 | 23668:c014c3fe0de9 |
---|---|
192 static void | 192 static void |
193 init_plugin(PurplePlugin *plugin) | 193 init_plugin(PurplePlugin *plugin) |
194 { | 194 { |
195 #ifdef HAVE_CYRUS_SASL | 195 #ifdef HAVE_CYRUS_SASL |
196 #ifdef _WIN32 | 196 #ifdef _WIN32 |
197 UINT old_error_mode; | |
197 gchar *sasldir; | 198 gchar *sasldir; |
198 #endif | 199 #endif |
199 int ret; | 200 int ret; |
200 #endif | 201 #endif |
201 PurpleAccountUserSplit *split; | 202 PurpleAccountUserSplit *split; |
248 #ifdef HAVE_CYRUS_SASL | 249 #ifdef HAVE_CYRUS_SASL |
249 #ifdef _WIN32 | 250 #ifdef _WIN32 |
250 sasldir = g_build_filename(wpurple_install_dir(), "sasl2", NULL); | 251 sasldir = g_build_filename(wpurple_install_dir(), "sasl2", NULL); |
251 sasl_set_path(SASL_PATH_TYPE_PLUGIN, sasldir); | 252 sasl_set_path(SASL_PATH_TYPE_PLUGIN, sasldir); |
252 g_free(sasldir); | 253 g_free(sasldir); |
254 /* Suppress error popups for failing to load sasl plugins */ | |
255 old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS); | |
253 #endif | 256 #endif |
254 if ((ret = sasl_client_init(NULL)) != SASL_OK) { | 257 if ((ret = sasl_client_init(NULL)) != SASL_OK) { |
255 purple_debug_error("xmpp", "Error (%d) initializing SASL.\n", ret); | 258 purple_debug_error("xmpp", "Error (%d) initializing SASL.\n", ret); |
256 } | 259 } |
260 #ifdef _WIN32 | |
261 /* Restore the original error mode */ | |
262 SetErrorMode(old_error_mode); | |
263 #endif | |
257 #endif | 264 #endif |
258 jabber_register_commands(); | 265 jabber_register_commands(); |
259 | 266 |
260 jabber_iq_init(); | 267 jabber_iq_init(); |
261 jabber_pep_init(); | 268 jabber_pep_init(); |