Rename PurpleMenuAction to PurpleActionMenu

28 files changed, 92 insertions, 92 deletions

diff --git a/finch/gntblist.c b/finch/gntblist.c
index 17029a4736..be2d7efe27 100644
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -996,7 +996,7 @@ append_proto_menu(GntMenu *menu, PurpleConnection *gc, PurpleBlistNode *node)
 	for(list = purple_protocol_client_iface_blist_node_menu(protocol, node); list;
 			list = g_list_delete_link(list, list))
 	{
-		PurpleMenuAction *act = (PurpleMenuAction *) list->data;
+		PurpleActionMenu *act = (PurpleActionMenu *) list->data;
 		if (!act)
 			continue;
 		purple_menu_action_set_data(act, node);
@@ -1008,7 +1008,7 @@ static void
 add_custom_action(GntMenu *menu, const char *label, PurpleCallback callback,
 		gpointer data)
 {
-	PurpleMenuAction *action = purple_menu_action_new(label, callback, data, NULL);
+	PurpleActionMenu *action = purple_menu_action_new(label, callback, data, NULL);
 	finch_append_menu_action(menu, action, NULL);
 }
 
@@ -1086,7 +1086,7 @@ chat_components_edit(PurpleBlistNode *selected, PurpleChat *chat)
 static void
 autojoin_toggled(GntMenuItem *item, gpointer data)
 {
-	PurpleMenuAction *action = data;
+	PurpleActionMenu *action = data;
 	purple_blist_node_set_bool(purple_menu_action_get_data(action), "gnt-autojoin",
 				gnt_menuitem_check_get_checked(GNT_MENU_ITEM_CHECK(item)));
 }
@@ -1094,7 +1094,7 @@ autojoin_toggled(GntMenuItem *item, gpointer data)
 static void
 create_chat_menu(GntMenu *menu, PurpleChat *chat)
 {
-	PurpleMenuAction *action = purple_menu_action_new(_("Auto-join"), NULL, chat, NULL);
+	PurpleActionMenu *action = purple_menu_action_new(_("Auto-join"), NULL, chat, NULL);
 	GntMenuItem *check = gnt_menuitem_check_new(
 			purple_menu_action_get_label(action));
 	gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(check),
diff --git a/finch/gntconv.c b/finch/gntconv.c
index cbb999e659..fc8e23f8e7 100644
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -659,7 +659,7 @@ generate_e2ee_menu(FinchConv *ggc)
 
 	menu_actions = purple_e2ee_provider_get_conv_menu_actions(eprov, conv);
 	for (it = menu_actions; it; it = g_list_next(it)) {
-		PurpleMenuAction *action = it->data;
+		PurpleActionMenu *action = it->data;
 
 		finch_append_menu_action(sub, action, conv);
 	}
diff --git a/finch/gntmenuutil.c b/finch/gntmenuutil.c
index 0cebbf9fe5..e3cdec09b8 100644
--- a/finch/gntmenuutil.c
+++ b/finch/gntmenuutil.c
@@ -30,7 +30,7 @@
 static void
 context_menu_callback(GntMenuItem *item, gpointer data)
 {
-	PurpleMenuAction *action = data;
+	PurpleActionMenu *action = data;
 	if (action) {
 		void (*callback)(gpointer, gpointer);
 		callback = (void (*)(gpointer, gpointer))
@@ -43,7 +43,7 @@ context_menu_callback(GntMenuItem *item, gpointer data)
 }
 
 void
-finch_append_menu_action(GntMenu *menu, PurpleMenuAction *action, gpointer ctx)
+finch_append_menu_action(GntMenu *menu, PurpleActionMenu *action, gpointer ctx)
 {
 	GList *list;
 	GntMenuItem *item;
diff --git a/finch/gntmenuutil.h b/finch/gntmenuutil.h
index f449718bfe..1e2ff69a36 100644
--- a/finch/gntmenuutil.h
+++ b/finch/gntmenuutil.h
@@ -40,12 +40,12 @@
 /**
  * finch_append_menu_action:
  * @menu:   the GntMenu to add to
- * @action: the PurpleMenuAction to add
+ * @action: the PurpleActionMenu to add
  * @ctx:    the callback context, passed as the first argument to
- *               the PurpleMenuAction's PurpleCallback function.
+ *               the PurpleActionMenu's PurpleCallback function.
  *
- * Add a PurpleMenuAction to a GntMenu.
+ * Add a PurpleActionMenu to a GntMenu.
  */
-void finch_append_menu_action(GntMenu *menu, PurpleMenuAction *action, gpointer ctx);
+void finch_append_menu_action(GntMenu *menu, PurpleActionMenu *action, gpointer ctx);
 
 #endif
diff --git a/libpurple/action.c b/libpurple/action.c
index 0dfcf3cd81..09d1822ff8 100644
--- a/libpurple/action.c
+++ b/libpurple/action.c
@@ -19,7 +19,7 @@
 
 #include "action.h"
 
-struct _PurpleMenuAction {
+struct _PurpleActionMenu {
 	gchar *label;
 	GCallback callback;
 	gpointer data;
@@ -30,11 +30,11 @@ struct _PurpleMenuAction {
 /******************************************************************************
  * ActionMenu API
  *****************************************************************************/
-PurpleMenuAction *
+PurpleActionMenu *
 purple_menu_action_new(const gchar *label, GCallback callback, gpointer data,
                        GList *children)
 {
-	PurpleMenuAction *act = g_new(PurpleMenuAction, 1);
+	PurpleActionMenu *act = g_new(PurpleActionMenu, 1);
 
 	act->label = g_strdup(label);
 	act->callback = callback;
@@ -46,7 +46,7 @@ purple_menu_action_new(const gchar *label, GCallback callback, gpointer data,
 }
 
 void
-purple_menu_action_free(PurpleMenuAction *act) {
+purple_menu_action_free(PurpleActionMenu *act) {
 	g_return_if_fail(act != NULL);
 
 	g_free(act->stock_icon);
@@ -55,63 +55,63 @@ purple_menu_action_free(PurpleMenuAction *act) {
 }
 
 gchar *
-purple_menu_action_get_label(const PurpleMenuAction *act) {
+purple_menu_action_get_label(const PurpleActionMenu *act) {
 	g_return_val_if_fail(act != NULL, NULL);
 
 	return act->label;
 }
 
 GCallback
-purple_menu_action_get_callback(const PurpleMenuAction *act) {
+purple_menu_action_get_callback(const PurpleActionMenu *act) {
 	g_return_val_if_fail(act != NULL, NULL);
 
 	return act->callback;
 }
 
 gpointer
-purple_menu_action_get_data(const PurpleMenuAction *act) {
+purple_menu_action_get_data(const PurpleActionMenu *act) {
 	g_return_val_if_fail(act != NULL, NULL);
 
 	return act->data;
 }
 
 GList *
-purple_menu_action_get_children(const PurpleMenuAction *act) {
+purple_menu_action_get_children(const PurpleActionMenu *act) {
 	g_return_val_if_fail(act != NULL, NULL);
 
 	return act->children;
 }
 
 void
-purple_menu_action_set_label(PurpleMenuAction *act, gchar *label) {
+purple_menu_action_set_label(PurpleActionMenu *act, gchar *label) {
 	g_return_if_fail(act != NULL);
 
 	act-> label = label;
 }
 
 void
-purple_menu_action_set_callback(PurpleMenuAction *act, GCallback callback) {
+purple_menu_action_set_callback(PurpleActionMenu *act, GCallback callback) {
 	g_return_if_fail(act != NULL);
 
 	act->callback = callback;
 }
 
 void
-purple_menu_action_set_data(PurpleMenuAction *act, gpointer data) {
+purple_menu_action_set_data(PurpleActionMenu *act, gpointer data) {
 	g_return_if_fail(act != NULL);
 
 	act->data = data;
 }
 
 void
-purple_menu_action_set_children(PurpleMenuAction *act, GList *children) {
+purple_menu_action_set_children(PurpleActionMenu *act, GList *children) {
 	g_return_if_fail(act != NULL);
 
 	act->children = children;
 }
 
 void
-purple_menu_action_set_stock_icon(PurpleMenuAction *act, const gchar *stock) {
+purple_menu_action_set_stock_icon(PurpleActionMenu *act, const gchar *stock) {
 	g_return_if_fail(act != NULL);
 
 	g_free(act->stock_icon);
@@ -120,7 +120,7 @@ purple_menu_action_set_stock_icon(PurpleMenuAction *act, const gchar *stock) {
 }
 
 const gchar *
-purple_menu_action_get_stock_icon(PurpleMenuAction *act) {
+purple_menu_action_get_stock_icon(PurpleActionMenu *act) {
 	return act->stock_icon;
 }
 
diff --git a/libpurple/action.h b/libpurple/action.h
index 9f51912d69..dd8c48d848 100644
--- a/libpurple/action.h
+++ b/libpurple/action.h
@@ -33,13 +33,13 @@ typedef struct _PurpleProtocolAction PurpleProtocolAction;
 typedef void (*PurpleProtocolActionCallback)(PurpleProtocolAction *action);
 
 /**
- * PurpleMenuAction:
+ * PurpleActionMenu:
  *
  * A generic structure that contains information about an "action."  One
  * place this is is used is by protocols to tell the core the list of available
  * right-click actions for a buddy list row.
  */
-typedef struct _PurpleMenuAction PurpleMenuAction;
+typedef struct _PurpleActionMenu PurpleActionMenu;
 
 #include "connection.h"
 
@@ -63,122 +63,122 @@ G_BEGIN_DECLS
  *****************************************************************************/
 
 /**
- * purple_menu_action_new:
+ * purple_action_menu_new:
  * @label:    The text label to display for this action.
  * @callback: The function to be called when the action is used on
  *                 the selected item.
  * @data:     Additional data to be passed to the callback.
- * @children: (element-type PurpleMenuAction) (transfer full): Menu actions to
+ * @children: (element-type PurpleActionMenu) (transfer full): Menu actions to
  *            be added as a submenu of this action.
  *
- * Creates a new PurpleMenuAction.
+ * Creates a new PurpleActionMenu.
  *
- * Returns: The PurpleMenuAction.
+ * Returns: The PurpleActionMenu.
  */
-PurpleMenuAction *purple_menu_action_new(const gchar *label, GCallback callback, gpointer data, GList *children);
+PurpleActionMenu *purple_menu_action_new(const gchar *label, GCallback callback, gpointer data, GList *children);
 
 /**
  * purple_menu_action_free:
- * @act: The PurpleMenuAction to free.
+ * @act: The PurpleActionMenu to free.
  *
- * Frees a PurpleMenuAction
+ * Frees a PurpleActionMenu
  */
-void purple_menu_action_free(PurpleMenuAction *act);
+void purple_menu_action_free(PurpleActionMenu *act);
 
 /**
  * purple_menu_action_get_label:
- * @act:	The PurpleMenuAction.
+ * @act:	The PurpleActionMenu.
  *
- * Returns the label of the PurpleMenuAction.
+ * Returns the label of the PurpleActionMenu.
  *
  * Returns: The label string.
  */
-gchar *purple_menu_action_get_label(const PurpleMenuAction *act);
+gchar *purple_menu_action_get_label(const PurpleActionMenu *act);
 
 /**
  * purple_menu_action_get_callback:
- * @act:	The PurpleMenuAction.
+ * @act:	The PurpleActionMenu.
  *
- * Returns the callback of the PurpleMenuAction.
+ * Returns the callback of the PurpleActionMenu.
  *
  * Returns: The callback function.
  */
-GCallback purple_menu_action_get_callback(const PurpleMenuAction *act);
+GCallback purple_menu_action_get_callback(const PurpleActionMenu *act);
 
 /**
  * purple_menu_action_get_data:
- * @act:	The PurpleMenuAction.
+ * @act:	The PurpleActionMenu.
  *
- * Returns the data stored in the PurpleMenuAction.
+ * Returns the data stored in the PurpleActionMenu.
  *
  * Returns: The data.
  */
-gpointer purple_menu_action_get_data(const PurpleMenuAction *act);
+gpointer purple_menu_action_get_data(const PurpleActionMenu *act);
 
 /**
  * purple_menu_action_get_children:
- * @act:	The PurpleMenuAction.
+ * @act:	The PurpleActionMenu.
  *
- * Returns the children of the PurpleMenuAction.
+ * Returns the children of the PurpleActionMenu.
  *
- * Returns: (element-type PurpleMenuAction) (transfer none): The menu children.
+ * Returns: (element-type PurpleActionMenu) (transfer none): The menu children.
  */
-GList* purple_menu_action_get_children(const PurpleMenuAction *act);
+GList* purple_menu_action_get_children(const PurpleActionMenu *act);
 
 /**
  * purple_menu_action_set_label:
  * @act:   The menu action.
  * @label: The label for the menu action.
  *
- * Set the label to the PurpleMenuAction.
+ * Set the label to the PurpleActionMenu.
  */
-void purple_menu_action_set_label(PurpleMenuAction *act, gchar *label);
+void purple_menu_action_set_label(PurpleActionMenu *act, gchar *label);
 
 /**
  * purple_menu_action_set_callback:
  * @act:        The menu action.
  * @callback:   The callback.
  *
- * Set the callback that will be used by the PurpleMenuAction.
+ * Set the callback that will be used by the PurpleActionMenu.
  */
-void purple_menu_action_set_callback(PurpleMenuAction *act, GCallback callback);
+void purple_menu_action_set_callback(PurpleActionMenu *act, GCallback callback);
 
 /**
  * purple_menu_action_set_data:
  * @act:   The menu action.
- * @data:  The data used by this PurpleMenuAction
+ * @data:  The data used by this PurpleActionMenu
  *
- * Set the label to the PurpleMenuAction.
+ * Set the label to the PurpleActionMenu.
  */
-void purple_menu_action_set_data(PurpleMenuAction *act, gpointer data);
+void purple_menu_action_set_data(PurpleActionMenu *act, gpointer data);
 
 /**
  * purple_menu_action_set_children:
  * @act:       The menu action.
- * @children: (element-type PurpleMenuAction) (transfer full): The menu children
+ * @children: (element-type PurpleActionMenu) (transfer full): The menu children
  *
- * Set the children of the PurpleMenuAction.
+ * Set the children of the PurpleActionMenu.
  */
-void purple_menu_action_set_children(PurpleMenuAction *act, GList *children);
+void purple_menu_action_set_children(PurpleActionMenu *act, GList *children);
 
 /**
  * purple_menu_action_set_stock_icon:
  * @act:   The menu action.
  * @stock: The stock icon identifier.
  *
- * Sets the icon for the PurpleMenuAction.
+ * Sets the icon for the PurpleActionMenu.
  */
-void purple_menu_action_set_stock_icon(PurpleMenuAction *act, const gchar *stock);
+void purple_menu_action_set_stock_icon(PurpleActionMenu *act, const gchar *stock);
 
 /**
  * purple_menu_action_get_stock_icon:
  * @act: The menu action.
  *
- * Gets the stock icon of the PurpleMenuAction.
+ * Gets the stock icon of the PurpleActionMenu.
  *
  * Returns: The stock icon identifier.
  */
-const gchar *purple_menu_action_get_stock_icon(PurpleMenuAction *act);
+const gchar *purple_menu_action_get_stock_icon(PurpleActionMenu *act);
 
 /******************************************************************************
  * Protocol Action API
diff --git a/libpurple/blistnode.h b/libpurple/blistnode.h
index 5a2bb92f23..01650be57f 100644
--- a/libpurple/blistnode.h
+++ b/libpurple/blistnode.h
@@ -289,7 +289,7 @@ gboolean purple_blist_node_is_transient(PurpleBlistNode *node);
  * purple_blist_node_get_extended_menu:
  * @n: The blist node for which to obtain the extended menu items.
  *
- * Returns: (element-type PurpleMenuAction): The extended menu items for a buddy
+ * Returns: (element-type PurpleActionMenu): The extended menu items for a buddy
  *          list node, as harvested by the blist-node-extended-menu signal.
  */
 GList *purple_blist_node_get_extended_menu(PurpleBlistNode *n);
diff --git a/libpurple/conversation.h b/libpurple/conversation.h
index 6eebf5edcf..d6825950b9 100644
--- a/libpurple/conversation.h
+++ b/libpurple/conversation.h
@@ -619,8 +619,8 @@ void purple_conversation_send_confirm(PurpleConversation *conv, const char *mess
  *
  * Retrieves the extended menu items for the conversation.
  *
- * Returns: (element-type PurpleMenuAction):
- *          A list of PurpleMenuAction items, harvested by the
+ * Returns: (element-type PurpleActionMenu):
+ *          A list of PurpleActionMenu items, harvested by the
  *          chat-extended-menu signal. The list and the menuaction
  *          items should be freed by the caller.
  */
diff --git a/libpurple/e2ee.h b/libpurple/e2ee.h
index c13f64231d..0f0ce81ba6 100644
--- a/libpurple/e2ee.h
+++ b/libpurple/e2ee.h
@@ -223,7 +223,7 @@ purple_e2ee_provider_get_name(PurpleE2eeProvider *provider);
  * The function is called, when user extends the E2EE menu for the conversation
  * specified in its parameter.
  *
- * Function should return the GList of PurpleMenuAction objects.
+ * Function should return the GList of PurpleActionMenu objects.
  */
 void
 purple_e2ee_provider_set_conv_menu_cb(PurpleE2eeProvider *provider,
@@ -245,7 +245,7 @@ purple_e2ee_provider_get_conv_menu_cb(PurpleE2eeProvider *provider);
  * @provider: The E2EE provider.
  * @conv: The conversation.
  *
- * Returns: (element-type PurpleMenuAction) (transfer full): The list of
+ * Returns: (element-type PurpleActionMenu) (transfer full): The list of
  *          actions for an E2EE menu.
  */
 GList *
diff --git a/libpurple/plugins/autoaccept.c b/libpurple/plugins/autoaccept.c
index f1108cc751..ed569871b7 100644
--- a/libpurple/plugins/autoaccept.c
+++ b/libpurple/plugins/autoaccept.c
@@ -217,7 +217,7 @@ set_auto_accept_settings(PurpleBlistNode *node, gpointer plugin)
 static void
 context_menu(PurpleBlistNode *node, GList **menu, gpointer plugin)
 {
-	PurpleMenuAction *action;
+	PurpleActionMenu *action;
 
 	if (!PURPLE_IS_BUDDY(node) && !PURPLE_IS_CONTACT(node) &&
 		!purple_blist_node_is_transient(node))
diff --git a/libpurple/plugins/buddynote.c b/libpurple/plugins/buddynote.c
index 94246cc653..e639dcd375 100644
--- a/libpurple/plugins/buddynote.c
+++ b/libpurple/plugins/buddynote.c
@@ -55,7 +55,7 @@ buddynote_edit_cb(PurpleBlistNode *node, gpointer data)
 static void
 buddynote_extended_menu_cb(PurpleBlistNode *node, GList **m)
 {
-	PurpleMenuAction *bna = NULL;
+	PurpleActionMenu *bna = NULL;
 
 	if (purple_blist_node_is_transient(node))
 		return;
diff --git a/libpurple/protocol.h b/libpurple/protocol.h
index dcc7178c78..dbd26ff3ab 100644
--- a/libpurple/protocol.h
+++ b/libpurple/protocol.h
@@ -158,7 +158,7 @@ typedef struct _PurpleProtocolClientIface PurpleProtocolClientIface;
  * @status_text:     Gets a short string representing this buddy's status. This
  *                   will be shown on the buddy list.
  * @tooltip_text:    Allows the protocol to add text to a buddy's tooltip.
- * @blist_node_menu: Returns a list of #PurpleMenuAction structs, which
+ * @blist_node_menu: Returns a list of #PurpleActionMenu structs, which
  *                   represent extra actions to be shown in (for example) the
  *                   right-click menu for @node.
  * @normalize: Convert the username @who to its canonical form. Also checks for
diff --git a/libpurple/protocols/facebook/facebook.c b/libpurple/protocols/facebook/facebook.c
index 3a83dc77bd..210899436a 100644
--- a/libpurple/protocols/facebook/facebook.c
+++ b/libpurple/protocols/facebook/facebook.c
@@ -1159,7 +1159,7 @@ fb_client_blist_node_menu(PurpleBlistNode *node)
 	GList *acts = NULL;
 	PurpleAccount *acct;
 	PurpleConnection *gc;
-	PurpleMenuAction *act;
+	PurpleActionMenu *act;
 
 	if (!PURPLE_IS_BUDDY(node)) {
 		return NULL;
diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c
index dfb98773cc..5170f8bbc0 100644
--- a/libpurple/protocols/jabber/buddy.c
+++ b/libpurple/protocols/jabber/buddy.c
@@ -1852,7 +1852,7 @@ static GList *jabber_buddy_menu(PurpleBuddy *buddy)
 	GList *jbrs;
 
 	GList *m = NULL;
-	PurpleMenuAction *act;
+	PurpleActionMenu *act;
 
 	if(!jb)
 		return m;
diff --git a/libpurple/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c
index 84eff57011..e886380d4b 100644
--- a/libpurple/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
@@ -3449,7 +3449,7 @@ static GList *
 novell_blist_node_menu(PurpleBlistNode *node)
 {
 	GList *list = NULL;
-	PurpleMenuAction *act;
+	PurpleActionMenu *act;
 
 	if(PURPLE_IS_BUDDY(node)) {
 		act = purple_menu_action_new(_("Initiate _Chat"),
diff --git a/libpurple/protocols/null/nullprpl.c b/libpurple/protocols/null/nullprpl.c
index 9a3c94b8a2..12d42251d5 100644
--- a/libpurple/protocols/null/nullprpl.c
+++ b/libpurple/protocols/null/nullprpl.c
@@ -327,7 +327,7 @@ static GList *null_blist_node_menu(PurpleBlistNode *node) {
   purple_debug_info("nullprpl", "providing buddy list context menu item\n");
 
   if (PURPLE_IS_BUDDY(node)) {
-    PurpleMenuAction *action = purple_menu_action_new(
+    PurpleActionMenu *action = purple_menu_action_new(
       _("NullProtocol example menu item"),
       PURPLE_CALLBACK(blist_example_menu_item),
       NULL,   /* userdata passed to the callback */
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index 31637b9c75..647cb62e14 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -4918,7 +4918,7 @@ oscar_buddy_menu(PurpleBuddy *buddy) {
 	PurpleConnection *gc;
 	OscarData *od;
 	GList *menu;
-	PurpleMenuAction *act;
+	PurpleActionMenu *act;
 	aim_userinfo_t *userinfo;
 	PurpleAccount *account;
 	const char *bname = purple_buddy_get_name(buddy);
diff --git a/libpurple/protocols/oscar/visibility.c b/libpurple/protocols/oscar/visibility.c
index 993f973a15..cd48642e17 100644
--- a/libpurple/protocols/oscar/visibility.c
+++ b/libpurple/protocols/oscar/visibility.c
@@ -69,7 +69,7 @@ visibility_cb(PurpleBlistNode *node, gpointer whatever)
 	}
 }
 
-PurpleMenuAction *
+PurpleActionMenu *
 create_visibility_menu_item(OscarData *od, const char *bname)
 {
 	PurpleAccount *account = purple_connection_get_account(od->gc);
diff --git a/libpurple/protocols/oscar/visibility.h b/libpurple/protocols/oscar/visibility.h
index 4efe1db5b2..65e1c35a6d 100644
--- a/libpurple/protocols/oscar/visibility.h
+++ b/libpurple/protocols/oscar/visibility.h
@@ -25,7 +25,7 @@
 #include "plugins.h"
 #include "action.h"
 
-PurpleMenuAction * create_visibility_menu_item(OscarData *od, const char *bname);
+PurpleActionMenu * create_visibility_menu_item(OscarData *od, const char *bname);
 void oscar_show_visible_list(PurpleProtocolAction *action);
 void oscar_show_invisible_list(PurpleProtocolAction *action);
 
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
index 2048ecdefd..cfb3ff315e 100644
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -1337,7 +1337,7 @@ static void blist_node_menu_cb(PurpleBlistNode *node,
                                GList **menu, struct mwPurpleProtocolData *pd) {
   const char *owner;
   PurpleAccount *acct;
-  PurpleMenuAction *act;
+  PurpleActionMenu *act;
 
   /* we only want groups */
   if(! PURPLE_IS_GROUP(node)) return;
@@ -3535,7 +3535,7 @@ static void blist_menu_conf(PurpleBlistNode *node, gpointer data) {
 
 static GList *mw_protocol_blist_node_menu(PurpleBlistNode *node) {
   GList *l = NULL;
-  PurpleMenuAction *act;
+  PurpleActionMenu *act;
 
   if(! PURPLE_IS_BUDDY(node))
     return l;
diff --git a/libpurple/protocols/silc/buddy.c b/libpurple/protocols/silc/buddy.c
index 1b0d146179..11cc8f9997 100644
--- a/libpurple/protocols/silc/buddy.c
+++ b/libpurple/protocols/silc/buddy.c
@@ -1663,7 +1663,7 @@ GList *silcpurple_buddy_menu(PurpleBuddy *buddy)
 	SilcClientConnection conn = sg->conn;
 	const char *pkfile = NULL;
 	SilcClientEntry client_entry = NULL;
-	PurpleMenuAction *act;
+	PurpleActionMenu *act;
 	GList *m = NULL;
 	SilcPurpleBuddyWb wb;
 
diff --git a/libpurple/protocols/silc/chat.c b/libpurple/protocols/silc/chat.c
index 74af413d95..27dc1da21a 100644
--- a/libpurple/protocols/silc/chat.c
+++ b/libpurple/protocols/silc/chat.c
@@ -872,7 +872,7 @@ GList *silcpurple_chat_menu(PurpleChat *chat)
 	SilcUInt32 mode = 0;
 
 	GList *m = NULL;
-	PurpleMenuAction *act;
+	PurpleActionMenu *act;
 
 	if (components)
 		chname = g_hash_table_lookup(components, "channel");
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index fd1f1b5032..d18d33c8b6 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -1412,7 +1412,7 @@ pidgin_append_blist_node_proto_menu(GtkWidget *menu, PurpleConnection *gc,
 		return;
 
 	for(l = ll = purple_protocol_client_iface_blist_node_menu(protocol, node); l; l = l->next) {
-		PurpleMenuAction *act = (PurpleMenuAction *) l->data;
+		PurpleActionMenu *act = (PurpleActionMenu *) l->data;
 		pidgin_append_menu_action(menu, act, node);
 	}
 	g_list_free(ll);
@@ -1424,7 +1424,7 @@ pidgin_append_blist_node_extended_menu(GtkWidget *menu, PurpleBlistNode *node)
 	GList *l, *ll;
 
 	for(l = ll = purple_blist_node_get_extended_menu(node); l; l = l->next) {
-		PurpleMenuAction *act = (PurpleMenuAction *) l->data;
+		PurpleActionMenu *act = (PurpleActionMenu *) l->data;
 		pidgin_append_menu_action(menu, act, node);
 	}
 	g_list_free(ll);
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 327ce35fb9..cadad7abb0 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -3555,7 +3555,7 @@ regenerate_plugins_items(PidginConvWindow *win)
 	}
 
 	for(; list; list = g_list_delete_link(list, list)) {
-		PurpleMenuAction *act = (PurpleMenuAction *) list->data;
+		PurpleActionMenu *act = (PurpleActionMenu *) list->data;
 		item = pidgin_append_menu_action(menu, act, conv);
 		action_items = g_list_prepend(action_items, item);
 		gtk_widget_show_all(item);
@@ -4236,7 +4236,7 @@ generate_e2ee_controls(PidginConvWindow *win)
 
 	menu_actions = purple_e2ee_provider_get_conv_menu_actions(provider, conv);
 	for (it = menu_actions; it; it = g_list_next(it)) {
-		PurpleMenuAction *action = it->data;
+		PurpleActionMenu *action = it->data;
 
 		gtk_widget_show_all(
 			pidgin_append_menu_action(menu, action, conv));
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index 7483d80d0b..c80c2e9cfc 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -1754,7 +1754,7 @@ menu_action_cb(GtkMenuItem *item, gpointer object)
 }
 
 GtkWidget *
-pidgin_append_menu_action(GtkWidget *menu, PurpleMenuAction *act,
+pidgin_append_menu_action(GtkWidget *menu, PurpleActionMenu *act,
                             gpointer object)
 {
 	GtkWidget *menuitem;
@@ -1826,7 +1826,7 @@ pidgin_append_menu_action(GtkWidget *menu, PurpleMenuAction *act,
 		}
 
 		for (l = list; l; l = l->next) {
-			PurpleMenuAction *act = (PurpleMenuAction *)l->data;
+			PurpleActionMenu *act = (PurpleActionMenu *)l->data;
 
 			pidgin_append_menu_action(submenu, act, object);
 		}
diff --git a/pidgin/gtkutils.h b/pidgin/gtkutils.h
index 64aa71b5b3..9df86e5447 100644
--- a/pidgin/gtkutils.h
+++ b/pidgin/gtkutils.h
@@ -555,14 +555,14 @@ const char *pidgin_stock_id_from_presence(PurplePresence *presence);
 /**
  * pidgin_append_menu_action:
  * @menu:    The menu to append to.
- * @act:     The PurpleMenuAction to append.
+ * @act:     The PurpleActionMenu to append.
  * @gobject: The object to be passed to the action callback.
  *
- * Append a PurpleMenuAction to a menu.
+ * Append a PurpleActionMenu to a menu.
  *
  * Returns: (transfer full): The menuitem added.
  */
-GtkWidget *pidgin_append_menu_action(GtkWidget *menu, PurpleMenuAction *act,
+GtkWidget *pidgin_append_menu_action(GtkWidget *menu, PurpleActionMenu *act,
                                  gpointer gobject);
 
 /**
diff --git a/pidgin/plugins/gevolution/gevolution.c b/pidgin/plugins/gevolution/gevolution.c
index 4e8ab5ac28..2dc2e53832 100644
--- a/pidgin/plugins/gevolution/gevolution.c
+++ b/pidgin/plugins/gevolution/gevolution.c
@@ -266,7 +266,7 @@ menu_item_send_mail_activate_cb(PurpleBlistNode *node, gpointer user_data)
 static void
 blist_node_extended_menu_cb(PurpleBlistNode *node, GList **menu)
 {
-	PurpleMenuAction *act;
+	PurpleActionMenu *act;
 	PurpleBuddy *buddy;
 	PurpleAccount *account;
 	EContact *contact;
diff --git a/pidgin/plugins/markerline.c b/pidgin/plugins/markerline.c
index ef976e42c1..93fd7e2482 100644
--- a/pidgin/plugins/markerline.c
+++ b/pidgin/plugins/markerline.c
@@ -168,7 +168,7 @@ conv_menu_cb(PurpleConversation *conv, GList **list)
 {
 	gboolean enabled = ((PURPLE_IS_IM_CONVERSATION(conv) && purple_prefs_get_bool(PREF_IMS)) ||
 		(PURPLE_IS_CHAT_CONVERSATION(conv) && purple_prefs_get_bool(PREF_CHATS)));
-	PurpleMenuAction *action = purple_menu_action_new(_("Jump to markerline"),
+	PurpleActionMenu *action = purple_menu_action_new(_("Jump to markerline"),
 			enabled ? PURPLE_CALLBACK(jump_to_markerline) : NULL, NULL, NULL);
 	*list = g_list_append(*list, action);
 }