/soc/2013/ankitkv/gobjectification: f8b890ba0789: Renamed protoc...

[Ankit Vani]

Changeset: f8b890ba07899626cdd7fdb8bbb82ae6b47e84c0
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-08-11 00:22 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/f8b890ba0789

Description:

Renamed protocol's actions function to get_actions

diffstat:

 finch/gntblist.c |  4 ++--
 libpurple/prpl.h |  2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (33 lines):

diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -2493,7 +2493,7 @@ build_protocol_actions(GntMenuItem *item
 	GntMenuItem *menuitem;
 
 	gnt_menuitem_set_submenu(item, GNT_MENU(sub));
-	for (actions = prpl_info->actions(gc); actions;
+	for (actions = prpl_info->get_actions(gc); actions;
 			actions = g_list_delete_link(actions, actions)) {
 		if (actions->data) {
 			PurpleProtocolAction *action = actions->data;
@@ -2612,7 +2612,7 @@ reconstruct_accounts_menu(void)
 			continue;
 		prpl_info = purple_connection_get_protocol_info(gc);
 
-		if (prpl_info->actions) {
+		if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_actions)) {
 			item = gnt_menuitem_new(purple_account_get_username(account));
 			gnt_menu_add_item(GNT_MENU(sub), item);
 			build_protocol_actions(item, prpl_info, gc);
diff --git a/libpurple/prpl.h b/libpurple/prpl.h
--- a/libpurple/prpl.h
+++ b/libpurple/prpl.h
@@ -265,7 +265,7 @@ struct _PurplePluginProtocolInfo
 	/**
 	 * Callback that returns the actions the protocol can perform
 	 */
-	GList *(*actions)(PurpleConnection *);
+	GList *(*get_actions)(PurpleConnection *);
 
 	PurpleBuddyIconSpec icon_spec; /**< The icon spec. */