pidgin: d74415be: Replace the last raw references to "->pr...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: d74415beaf0f8e1ed4743514e1d90669676b8596
Parent:   49c0344b0fbfdcf6f15806030752ef761a959eae
Author:   andrew.victor at mxit.com
Date:     08/31/11 17:26:02
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d74415beaf0f8e1ed4743514e1d90669676b8596

Changelog: 

Replace the last raw references to "->proto_data".


Changes against parent 49c0344b0fbfdcf6f15806030752ef761a959eae

  patched  libpurple/protocols/bonjour/mdns_win32.c
  patched  libpurple/protocols/myspace/user.c

-------------- next part --------------
============================================================
--- libpurple/protocols/bonjour/mdns_win32.c	7d80de474b3ebee47a339ff2f77eda76cb8a3f39
+++ libpurple/protocols/bonjour/mdns_win32.c	0a6d6edd38146b4a922d9b1fb4d0d1a654d13a8c
@@ -177,7 +177,7 @@ _mdns_resolve_host_callback(DNSServiceRe
 	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 @@ _mdns_service_browse_callback(DNSService
 
 				/* 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 @@ _mdns_service_browse_callback(DNSService
 					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 @@ _mdns_service_browse_callback(DNSService
 			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);
============================================================
--- libpurple/protocols/myspace/user.c	ee102a4ba38de61bc622e88ef32118fb659a5184
+++ libpurple/protocols/myspace/user.c	2d27ea382026271d4c6eb3ba69be63f7c425bc19
@@ -412,7 +412,7 @@ msim_store_user_info_each(const gchar *k
  *
  * @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