changeset 19661:3617681a2694

merge of 'be9dba922e9f366e12da62fe2e2708b38d82b9c4' and 'fb001ef80adcc30cf1efa388ad1fcc3fe0144ba9'
author Kevin Stange <kevin@simguy.net>
date Thu, 06 Sep 2007 06:30:34 +0000
parents 15cb06e2d387 (current diff) 1525c75849cc (diff)
children aa3920f45ff3 132876614048
files libpurple/protocols/myspace/myspace.c
diffstat 2 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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()
--- 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");