# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1231046485 0
# Node ID f7a2045f93468d911c31eee25e39418e4712cc5c
# Parent  c7d4b67b33326819bfbf035575cfd671906bd519# Parent  fc32b392c968787573820144d97fbb768113aa58
propagate from branch 'im.pidgin.pidgin' (head 7bd1f8a0fcc289166add1f0b4d84fdac526ab4a7)
            to branch 'im.pidgin.pidgin.vv' (head 1656e035e23020316898b4fff6f70cb86c30b636)

diff -r c7d4b67b3332 -r f7a2045f9346 libpurple/core.c
--- a/libpurple/core.c	Sun Jan 04 05:19:54 2009 +0000
+++ b/libpurple/core.c	Sun Jan 04 05:21:25 2009 +0000
@@ -137,7 +137,7 @@
 	 * subsystem right away too.
 	 */
 	purple_plugins_init();
-	
+
 	/* Initialize all static protocols. */
 	static_proto_init();
 
@@ -213,7 +213,6 @@
 	purple_accounts_uninit();
 	purple_savedstatuses_uninit();
 	purple_status_uninit();
-	purple_prefs_uninit();
 	purple_sound_uninit();
 	purple_xfers_uninit();
 	purple_proxy_uninit();
@@ -244,6 +243,7 @@
 #ifdef _WIN32
 	wpurple_cleanup();
 #endif
+	purple_prefs_uninit();
 
 	_core = NULL;
 }
diff -r c7d4b67b3332 -r f7a2045f9346 libpurple/prefs.c
--- a/libpurple/prefs.c	Sun Jan 04 05:19:54 2009 +0000
+++ b/libpurple/prefs.c	Sun Jan 04 05:21:25 2009 +0000
@@ -714,7 +714,8 @@
 
 	name = pref_full_name(pref);
 
-	purple_debug_info("prefs", "removing pref %s\n", name);
+	if (prefs_loaded)
+		purple_debug_info("prefs", "removing pref %s\n", name);
 
 	g_hash_table_remove(prefs_hash, name);
 	g_free(name);
@@ -1454,7 +1455,7 @@
 		sync_prefs();
 	}
 
-	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
+	prefs_loaded = FALSE;
 	purple_prefs_destroy();
 	g_hash_table_destroy(prefs_hash);
 	prefs_hash = NULL;
diff -r c7d4b67b3332 -r f7a2045f9346 libpurple/protocols/simple/simple.c
--- a/libpurple/protocols/simple/simple.c	Sun Jan 04 05:19:54 2009 +0000
+++ b/libpurple/protocols/simple/simple.c	Sun Jan 04 05:21:25 2009 +0000
@@ -1942,8 +1942,7 @@
 	if (userserver[1] == NULL || userserver[1][0] == '\0') {
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
-			_("Unable to connect to server. Please enter the "
-			  "address of the server you wish to connect to."));
+			_("SIP connect server not specified"));
 		return;
 	}