# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1237777596 0
# Node ID ea6b3aa222f19d58324b54aebf78edbda29ef1ee
# Parent  bdb34fc5d8891acd0126cd688fd6605d6ca2e0bf# Parent  b23211876f478a1c92e9c7b89e4d5792ac8eec0e
merge of '96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1'
     and 'd70375c084af2336e7fc6646fb778120b05de9a8'

diff -r b23211876f47 -r ea6b3aa222f1 libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Fri Mar 20 06:01:48 2009 +0000
+++ b/libpurple/protocols/msn/notification.c	Mon Mar 23 03:06:36 2009 +0000
@@ -1609,7 +1609,7 @@
 
 	if ( (root = xmlnode_from_str(cmd->payload, cmd->payload_len)) == NULL)
 	{
-		purple_debug_error("msn", "Unable to parse GCF payload into a XML tree");
+		purple_debug_error("msn", "Unable to parse GCF payload into a XML tree\n");
 		return;
 	}
 
@@ -1682,7 +1682,7 @@
 	user = msn_userlist_find_user(session->userlist, passport);
 	if (user == NULL) {
 		char *str = g_strndup(payload, len);
-		purple_debug_info("msn", "unknown user %s, payload is %s",
+		purple_debug_info("msn", "unknown user %s, payload is %s\n",
 			passport, str);
 		g_free(str);
 		return;
diff -r b23211876f47 -r ea6b3aa222f1 libpurple/protocols/msn/oim.c
--- a/libpurple/protocols/msn/oim.c	Fri Mar 20 06:01:48 2009 +0000
+++ b/libpurple/protocols/msn/oim.c	Mon Mar 23 03:06:36 2009 +0000
@@ -174,7 +174,7 @@
 		gchar *faultcode_str = xmlnode_get_data(faultcode);
 
 		if (faultcode_str && g_str_equal(faultcode_str, "q0:BadContextToken")) {
-			purple_debug_warning("msn", "OIM Request Error, Updating token now.");
+			purple_debug_warning("msn", "OIM Request Error, Updating token now.\n");
 			msn_nexus_update_token(data->oim->session->nexus,
 				data->send ? MSN_AUTH_LIVE_SECURE : MSN_AUTH_MESSENGER_WEB,
 				(GSourceFunc)msn_oim_request_helper, data);
@@ -183,7 +183,7 @@
 
 		} else if (faultcode_str && g_str_equal(faultcode_str, "q0:AuthenticationFailed")) {
 			if (xmlnode_get_child(fault, "detail/RequiredAuthPolicy") != NULL) {
-				purple_debug_warning("msn", "OIM Request Error, Updating token now.");
+				purple_debug_warning("msn", "OIM Request Error, Updating token now.\n");
 				msn_nexus_update_token(data->oim->session->nexus,
 					data->send ? MSN_AUTH_LIVE_SECURE : MSN_AUTH_MESSENGER_WEB,
 					(GSourceFunc)msn_oim_request_helper, data);
diff -r b23211876f47 -r ea6b3aa222f1 libpurple/protocols/msn/state.c
--- a/libpurple/protocols/msn/state.c	Fri Mar 20 06:01:48 2009 +0000
+++ b/libpurple/protocols/msn/state.c	Mon Mar 23 03:06:36 2009 +0000
@@ -169,7 +169,7 @@
 	}
 	currentmediaNode = xmlnode_get_child(payloadNode, "CurrentMedia");
 	if (currentmediaNode == NULL) {
-		purple_debug_info("msn", "No CurrentMedia Node");
+		purple_debug_info("msn", "No CurrentMedia Node\n");
 		xmlnode_free(payloadNode);
 		return NULL;
 	}
@@ -195,7 +195,7 @@
 	}
 	psmNode = xmlnode_get_child(payloadNode, "PSM");
 	if (psmNode == NULL) {
-		purple_debug_info("msn", "No PSM status Node");
+		purple_debug_info("msn", "No PSM status Node\n");
 		xmlnode_free(payloadNode);
 		return NULL;
 	}
diff -r b23211876f47 -r ea6b3aa222f1 libpurple/protocols/msn/switchboard.c
--- a/libpurple/protocols/msn/switchboard.c	Fri Mar 20 06:01:48 2009 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Mon Mar 23 03:06:36 2009 +0000
@@ -590,7 +590,7 @@
 	payload = msn_message_gen_payload(msg, &payload_len);
 
 #ifdef MSN_DEBUG_SB
-	purple_debug_info("msn", "SB length:{%" G_GSIZE_FORMAT "}", payload_len);
+	purple_debug_info("msn", "SB length:{%" G_GSIZE_FORMAT "}\n", payload_len);
 	msn_message_show_readable(msg, "SB SEND", FALSE);
 #endif
 
diff -r b23211876f47 -r ea6b3aa222f1 libpurple/protocols/msn/userlist.c
--- a/libpurple/protocols/msn/userlist.c	Fri Mar 20 06:01:48 2009 +0000
+++ b/libpurple/protocols/msn/userlist.c	Mon Mar 23 03:06:36 2009 +0000
@@ -858,7 +858,7 @@
 	}
 
 	if ( (user = msn_userlist_find_user(userlist, who)) == NULL) {
-		purple_debug_error("msn", "User %s not found!", who);
+		purple_debug_error("msn", "User %s not found!\n", who);
 		return FALSE;
 	}
 
@@ -887,7 +887,7 @@
 	}
 
 	if ( (user = msn_userlist_find_user(userlist, who)) == NULL) {
-		purple_debug_error("msn", "User %s not found!", who);
+		purple_debug_error("msn", "User %s not found!\n", who);
 		return FALSE;
 	}
 
diff -r b23211876f47 -r ea6b3aa222f1 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Fri Mar 20 06:01:48 2009 +0000
+++ b/pidgin/gtkaccount.c	Mon Mar 23 03:06:36 2009 +0000
@@ -756,10 +756,6 @@
 		dialog->protocol_frame = NULL;
 	}
 
-	if (dialog->prpl_info == NULL ||
-			dialog->prpl_info->protocol_options == NULL)
-		return;
-
 	while (dialog->protocol_opt_entries != NULL) {
 		ProtocolOptEntry *opt_entry = dialog->protocol_opt_entries->data;
 		g_free(opt_entry->setting);
@@ -767,6 +763,10 @@
 		dialog->protocol_opt_entries = g_list_delete_link(dialog->protocol_opt_entries, dialog->protocol_opt_entries);
 	}
 
+	if (dialog->prpl_info == NULL ||
+			dialog->prpl_info->protocol_options == NULL)
+		return;
+
 	account = dialog->account;
 
 	/* Build the protocol options frame. */