# HG changeset patch
# User andrew.victor@mxit.com
# Date 1315050684 0
# Node ID cadc8dfafbafaaf87a7a8b22bcc97581fa8a58ae
# Parent  4f6b06139734aa4d5285ea198ff746f7abbeb14f# Parent  d66ce874075a8aaafbb010c3d0b55264caf9ac8c
merge of '21f078cdce656c60707d6518904262ee44ac648c'
     and 'b4fc734e44f103a918a1a34ad16d57bf4a40ef16'

diff -r 4f6b06139734 -r cadc8dfafbaf libpurple/protocols/bonjour/mdns_win32.c
--- a/libpurple/protocols/bonjour/mdns_win32.c	Fri Sep 02 21:15:24 2011 +0000
+++ b/libpurple/protocols/bonjour/mdns_win32.c	Sat Sep 03 11:51:24 2011 +0000
@@ -177,7 +177,7 @@
 	args->resolver_query = NULL;
 
 	if ((pb = purple_find_buddy(args->account, args->res_data->name))) {
-		if (pb->proto_data != args->bb) {
+		if (purple_buddy_get_protocol_data(pb) != args->bb) {
 			purple_debug_error("bonjour", "Found purple buddy for %s not matching bonjour buddy record.",
 				args->res_data->name);
 			goto cleanup;
@@ -348,7 +348,7 @@
 
 				/* Is there an existing buddy? */
 				if ((pb = purple_find_buddy(account, serviceName)))
-					bb = pb->proto_data;
+					bb = purple_buddy_get_protocol_data(pb);
 				/* Is there a pending buddy? */
 				else {
 					while (tmp) {
@@ -368,7 +368,7 @@
 					if (pb == NULL)
 						pending_buddies = g_slist_prepend(pending_buddies, bb);
 					else
-						pb->proto_data = bb;
+						purple_buddy_set_protocol_data(pb, bb);
 				}
 
 				rd = g_new0(Win32SvcResolverData, 1);
@@ -408,7 +408,7 @@
 			GSList *l;
 			/* There may be multiple presences, we should only get rid of this one */
 			Win32SvcResolverData *rd_search;
-			BonjourBuddy *bb = pb->proto_data;
+			BonjourBuddy *bb = purple_buddy_get_protocol_data(pb);
 			Win32BuddyImplData *idata;
 
 			g_return_if_fail(bb != NULL);
diff -r 4f6b06139734 -r cadc8dfafbaf libpurple/protocols/myspace/user.c
--- a/libpurple/protocols/myspace/user.c	Fri Sep 02 21:15:24 2011 +0000
+++ b/libpurple/protocols/myspace/user.c	Sat Sep 03 11:51:24 2011 +0000
@@ -412,7 +412,7 @@
  *
  * @param session
  * @param msg The user information reply, with any amount of information.
- * @param user The structure to save to, or NULL to save in PurpleBuddy->proto_data.
+ * @param user The structure to save to, or NULL to save in PurpleBuddy's protocol_data.
  *
  * Variable information is saved to the passed MsimUser structure. Permanent
  * information (UserID) is stored in the blist node of the buddy list (and