# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1189060234 0
# Node ID 3617681a26949f80425166f649ab3b50f5900582
# Parent  15cb06e2d387222f7af1d270d1f7b3653e4f1461# Parent  1525c75849cce8057678564d54447c7ce57936fe
merge of 'be9dba922e9f366e12da62fe2e2708b38d82b9c4'
     and 'fb001ef80adcc30cf1efa388ad1fcc3fe0144ba9'

diff -r 15cb06e2d387 -r 3617681a2694 finch/gntui.c
--- a/finch/gntui.c	Thu Sep 06 05:58:52 2007 +0000
+++ b/finch/gntui.c	Thu Sep 06 06:30:34 2007 +0000
@@ -91,8 +91,6 @@
 	gnt_register_action(_("Statuses"), finch_savedstatus_show_all);
 
 #ifdef STANDALONE
-
-	finch_plugins_save_loaded();
 }
 
 void gnt_ui_uninit()
diff -r 15cb06e2d387 -r 3617681a2694 libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Thu Sep 06 05:58:52 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Thu Sep 06 06:30:34 2007 +0000
@@ -1781,9 +1781,6 @@
 	purple_debug_info("msim", "msim_error (sesskey=%d): %s\n", 
 			session->sesskey, full_errmsg);
 
-	purple_notify_error(session->account, g_strdup(_("MySpaceIM Error")), 
-			full_errmsg, NULL);
-
 	/* Destroy session if fatal. */
 	if (msim_msg_get(msg, "fatal")) {
 		purple_debug_info("msim", "fatal error, closing\n");