/soc/2013/ankitkv/gobjectification: e1783e620a85: Renamed purple...

[Ankit Vani]

Changeset: e1783e620a854c389c09ada9e817077749ddc772
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-12 20:03 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/e1783e620a85

Description:

Renamed purple_roomlist_[gs]et_proto_data to purple_roomlist_[gs]et_protocol_data

diffstat:

 libpurple/protocols/yahoo/yahoochat.c |  16 ++++++++--------
 libpurple/roomlist.c                  |   4 ++--
 libpurple/roomlist.h                  |   4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs (92 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;
 
diff --git a/libpurple/roomlist.c b/libpurple/roomlist.c
--- a/libpurple/roomlist.c
+++ b/libpurple/roomlist.c
@@ -228,7 +228,7 @@ GList * purple_roomlist_get_fields(Purpl
 	return priv->fields;
 }
 
-gpointer purple_roomlist_get_proto_data(PurpleRoomlist *list)
+gpointer purple_roomlist_get_protocol_data(PurpleRoomlist *list)
 {
 	PurpleRoomlistPrivate *priv = PURPLE_ROOMLIST_GET_PRIVATE(list);
 
@@ -237,7 +237,7 @@ gpointer purple_roomlist_get_proto_data(
 	return priv->proto_data;
 }
 
-void purple_roomlist_set_proto_data(PurpleRoomlist *list, gpointer proto_data)
+void purple_roomlist_set_protocol_data(PurpleRoomlist *list, gpointer proto_data)
 {
 	PurpleRoomlistPrivate *priv = PURPLE_ROOMLIST_GET_PRIVATE(list);
 
diff --git a/libpurple/roomlist.h b/libpurple/roomlist.h
--- a/libpurple/roomlist.h
+++ b/libpurple/roomlist.h
@@ -253,7 +253,7 @@ GList *purple_roomlist_get_fields(Purple
  *         convenience field provided to the protocol plugin--it is not
  *         used the libpurple core.
  */
-gpointer purple_roomlist_get_proto_data(PurpleRoomlist *list);
+gpointer purple_roomlist_get_protocol_data(PurpleRoomlist *list);
 
 /**
  * Set the protocol data associated with this room list.
@@ -261,7 +261,7 @@ gpointer purple_roomlist_get_proto_data(
  * @param list The roomlist, which must not be @c NULL.
  * @param proto_data A pointer to associate with this room list.
  */
-void purple_roomlist_set_proto_data(PurpleRoomlist *list, gpointer proto_data);
+void purple_roomlist_set_protocol_data(PurpleRoomlist *list, gpointer proto_data);
 
 /**
  * Get the UI data associated with this room list.