/soc/2013/ankitkv/gobjectification: 5e52b2f940a3: Merged soc.201...

[Ankit Vani]

Changeset: 5e52b2f940a365efbd52df1e2d5c83fb06291acc
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-12 20:04 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/5e52b2f940a3

Description:

Merged soc.2013.gobjectification branch

diffstat:

 libpurple/protocols/yahoo/yahoochat.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (50 lines):

diff --git a/libpurple/protocols/yahoo/yahoochat.c b/libpurple/protocols/yahoo/yahoochat.c
--- a/libpurple/protocols/yahoo/yahoochat.c
+++ b/libpurple/protocols/yahoo/yahoochat.c
@@ -1362,9 +1362,9 @@ static void yahoo_roomlist_cleanup(Purpl
 	purple_roomlist_set_in_progress(list, FALSE);
 
 	if (yrl) {
-		GList *proto_data = purple_roomlist_get_proto_data(list);
+		GList *proto_data = purple_roomlist_get_protocol_data(list);
 		proto_data = g_list_remove(proto_data, yrl);
-		purple_roomlist_set_proto_data(list, proto_data);
+		purple_roomlist_set_protocol_data(list, proto_data);
 		yahoo_roomlist_destroy(yrl);
 	}
 
@@ -1481,9 +1481,9 @@ PurpleRoomlist *yahoo_roomlist_get_list(
 
 	purple_roomlist_set_fields(rl, fields);
 
-	proto_data = purple_roomlist_get_proto_data(rl);
+	proto_data = purple_roomlist_get_protocol_data(rl);
 	proto_data = g_list_append(proto_data, yrl);
-	purple_roomlist_set_proto_data(rl, proto_data);
+	purple_roomlist_set_protocol_data(rl, proto_data);
 
 	yahoo_roomlist_make_request(yrl);
 	purple_roomlist_set_in_progress(rl, TRUE);
@@ -1495,8 +1495,8 @@ void yahoo_roomlist_cancel(PurpleRoomlis
 {
 	GList *l, *k;
 
-	k = l = purple_roomlist_get_proto_data(list);
-	purple_roomlist_set_proto_data(list, NULL);
+	k = l = purple_roomlist_get_protocol_data(list);
+	purple_roomlist_set_protocol_data(list, NULL);
 
 	purple_roomlist_set_in_progress(list, FALSE);
 
@@ -1542,9 +1542,9 @@ void yahoo_roomlist_expand_category(Purp
 	yrl->list = list;
 	yrl->cat = category;
 
-	proto_data = purple_roomlist_get_proto_data(list);
+	proto_data = purple_roomlist_get_protocol_data(list);
 	proto_data = g_list_append(proto_data, yrl);
-	purple_roomlist_set_proto_data(list, proto_data);
+	purple_roomlist_set_protocol_data(list, proto_data);
 
 	yrl->url = url;