# HG changeset patch # User andrew.victor@mxit.com # Date 1314825962 0 # Node ID 01b832cc602a801ee2647308fb3e692322fb8ad9 # Parent 39d69f5bf146c59566cdc8963ecbf1ca38accf7d Replace the last raw references to "->proto_data". diff -r 39d69f5bf146 -r 01b832cc602a libpurple/protocols/bonjour/mdns_win32.c --- a/libpurple/protocols/bonjour/mdns_win32.c Tue Aug 30 22:07:19 2011 +0000 +++ b/libpurple/protocols/bonjour/mdns_win32.c Wed Aug 31 21:26:02 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 39d69f5bf146 -r 01b832cc602a libpurple/protocols/myspace/user.c --- a/libpurple/protocols/myspace/user.c Tue Aug 30 22:07:19 2011 +0000 +++ b/libpurple/protocols/myspace/user.c Wed Aug 31 21:26:02 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