diff libgaim/core.c @ 14238:f189327b9968

[gaim-migrate @ 16920] Cancelable DNS queries. This eliminates crashes when you cancel a connection attempt while we're waiting for a response from a DNS server. I tested with all three methods, so they SHOULD be ok. Let me know if you have problems. I should be around today, starting in maybe an hour. I feel like it's kinda dumb for us to have three implementations for the same thing. I want to get rid of the child-process method (currently used in Unix and OS-X) and use the thread-based method (currently used in Windows) everywhere. Then we can get rid of the third method, too (currently used when !Unix and !OS-X and !Windows) Any objections? committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 20 Aug 2006 22:24:13 +0000
parents ab8a105eff62
children f58283ce58ea
line wrap: on
line diff
--- a/libgaim/core.c	Sun Aug 20 22:16:13 2006 +0000
+++ b/libgaim/core.c	Sun Aug 20 22:24:13 2006 +0000
@@ -28,6 +28,7 @@
 #include "conversation.h"
 #include "core.h"
 #include "debug.h"
+#include "dnsquery.h"
 #include "ft.h"
 #include "idle.h"
 #include "network.h"
@@ -39,10 +40,10 @@
 #include "proxy.h"
 #include "savedstatuses.h"
 #include "signals.h"
+#include "sound.h"
 #include "sslconn.h"
 #include "status.h"
 #include "stun.h"
-#include "sound.h"
 
 #ifdef HAVE_DBUS
 #  include "dbus-server.h"
@@ -128,6 +129,7 @@
 	gaim_privacy_init();
 	gaim_pounces_init();
 	gaim_proxy_init();
+	gaim_dnsquery_init();
 	gaim_sound_init();
 	gaim_ssl_init();
 	gaim_stun_init();
@@ -172,6 +174,8 @@
 	gaim_status_uninit();
 	gaim_prefs_uninit();
 	gaim_xfers_uninit();
+	gaim_proxy_uninit();
+	gaim_dnsquery_uninit();
 
 	gaim_debug_info("main", "Unloading all plugins\n");
 	gaim_plugins_destroy_all();