Mercurial > pidgin3 / changeset

--- a/protocols/demo/purpledemoprotocol.c	Fri Aug 16 03:08:56 2024 -0500
+++ b/protocols/demo/purpledemoprotocol.c	Fri Aug 16 03:11:08 2024 -0500
@@ -58,8 +58,6 @@
 	purple_demo_protocol,
 	PURPLE_TYPE_PROTOCOL,
 	G_TYPE_FLAG_FINAL,
-	G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ACTIONS,
-	                              purple_demo_protocol_actions_init)
 	G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CONTACTS,
 	                              purple_demo_protocol_contacts_init)
 	G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CONVERSATION,

--- a/protocols/demo/purpledemoprotocolactions.c	Fri Aug 16 03:08:56 2024 -0500
+++ b/protocols/demo/purpledemoprotocolactions.c	Fri Aug 16 03:11:08 2024 -0500
@@ -188,7 +188,6 @@
 /******************************************************************************
  * Request API action implementations
  *****************************************************************************/
-
 static void
 purple_demo_protocol_request_fields_ok_cb(G_GNUC_UNUSED gpointer data,
                                           PurpleRequestPage *page)
@@ -506,17 +505,10 @@
 }
 
 /******************************************************************************
- * PurpleProtocolActions Implementation
+ * Helpers
  *****************************************************************************/
-static const gchar *
-purple_demo_protocol_get_prefix(G_GNUC_UNUSED PurpleProtocolActions *actions) {
-	return "prpl-demo";
-}
-
 static GActionGroup *
-purple_demo_protocol_get_action_group(G_GNUC_UNUSED PurpleProtocolActions *actions,
-                                      G_GNUC_UNUSED PurpleConnection *connection)
-{
+purple_demo_protocol_get_action_group(void) {
 	GSimpleActionGroup *group = NULL;
 	GActionEntry entries[] = {
 		{
@@ -551,9 +543,7 @@
 }
 
 static GMenu *
-purple_demo_protocol_get_menu(G_GNUC_UNUSED PurpleProtocolActions *actions,
-                              G_GNUC_UNUSED PurpleConnection *connection)
-{
+purple_demo_protocol_get_menu(void) {
 	GMenu *menu = NULL;
 	GMenuItem *item = NULL;
 
@@ -596,13 +586,9 @@
 	return menu;
 }
 
-void
-purple_demo_protocol_actions_init(PurpleProtocolActionsInterface *iface) {
-	iface->get_prefix = purple_demo_protocol_get_prefix;
-	iface->get_action_group = purple_demo_protocol_get_action_group;
-	iface->get_menu = purple_demo_protocol_get_menu;
-}
-
+/******************************************************************************
+ * Internal API
+ *****************************************************************************/
 BirbActionMenu *
 purple_demo_protocol_get_action_menu(G_GNUC_UNUSED PurpleProtocol *protocol,
                                      G_GNUC_UNUSED PurpleAccount *account)
@@ -614,13 +600,13 @@
 
 	action_menu = birb_action_menu_new();
 
-	group = purple_demo_protocol_get_action_group(NULL, NULL);
+	group = purple_demo_protocol_get_action_group();
 	birb_action_menu_add_action_group(action_menu, "prpl-demo", group);
 	g_clear_object(&group);
 
 	menu = birb_action_menu_get_menu(action_menu);
 
-	section = purple_demo_protocol_get_menu(NULL, NULL);
+	section = purple_demo_protocol_get_menu();
 	g_menu_append_section(menu, NULL, G_MENU_MODEL(section));
 	g_clear_object(&section);
 

--- a/protocols/demo/purpledemoprotocolactions.h	Fri Aug 16 03:08:56 2024 -0500
+++ b/protocols/demo/purpledemoprotocolactions.h	Fri Aug 16 03:11:08 2024 -0500
@@ -25,11 +25,6 @@
 
 #include <purple.h>
 
-G_GNUC_INTERNAL void purple_demo_protocol_actions_init(PurpleProtocolActionsInterface *iface);
-
-/* This temporarily here until we're ready to remove the protocol actions
- * implementation.
- */
 G_GNUC_INTERNAL BirbActionMenu *purple_demo_protocol_get_action_menu(PurpleProtocol *protocol, PurpleAccount *account);
 
 #endif /* PURPLE_DEMO_PROTOCOL_ACTIONS_H */