diff libpurple/core.c @ 18771:6ecbb322a803

merge of '5fbd62e0397f65bf7b8def7a4ad421e0044d429c' and 'aea49b9a427019527ec0e314f70a35c7defe0d89'
author Kevin Stange <kevin@simguy.net>
date Thu, 02 Aug 2007 04:16:37 +0000
parents 2cc872f4f620
children d470d42d2cb1
line wrap: on
line diff
--- a/libpurple/core.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/core.c	Thu Aug 02 04:16:37 2007 +0000
@@ -159,8 +159,9 @@
 	/*
 	 * Call this early on to try to auto-detect our IP address and
 	 * hopefully save some time later.
+	 * TODO: do this here after purple_prefs_load() has been moved into purple_prefs_init()
 	 */
-	purple_network_get_my_ip(-1);
+	/*purple_network_get_my_ip(-1);*/
 
 	if (ops != NULL && ops->ui_init != NULL)
 		ops->ui_init();