/soc/2013/ankitkv/gobjectification: 549a5e92c546: Merged roomlis...

[Ankit Vani]

Changeset: 549a5e92c5460897f5563c3204d5300230eee17c
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-13 19:13 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/549a5e92c546

Description:

Merged roomlist_[gs]et_protocol_data rename from soc.2013.gobjectification branch

diffstat:

 libpurple/roomlist.c |  4 ++--
 libpurple/roomlist.h |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (42 lines):

diff --git a/libpurple/roomlist.c b/libpurple/roomlist.c
--- a/libpurple/roomlist.c
+++ b/libpurple/roomlist.c
@@ -216,7 +216,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);
 
@@ -225,7 +225,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 -- 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.