pidgin/pidgin

Add a connection parameter to the PurpleProtocolActions.get_menu virtual function

16 months ago, Gary Kramlich
620d1adf91f2
Parents b1cfab593952
Children 92c8a7e3aaf5
Add a connection parameter to the PurpleProtocolActions.get_menu virtual function

This is necessary so that protocols can dynamically add menu items for specific
accounts. This could be something like adding administrator actions after the
protocol has determined that you're an administrator for example.

Testing Done:
Connected an xmpp, ircv3, and demo account and verified all of their actions were displayed properly.

Reviewed at https://reviews.imfreedom.org/r/2172/
7 files changed, 18 insertions(+), 10 deletions(-)
  • +2 -1
    libpurple/protocols/demo/purpledemoprotocolactions.c
  • +2 -1
    libpurple/protocols/gg/gg.c
  • +3 -1
    libpurple/protocols/irc/irc.c
  • +3 -1
    libpurple/protocols/jabber/jabber.c
  • +3 -2
    libpurple/purpleprotocolactions.c
  • +4 -3
    libpurple/purpleprotocolactions.h
  • +1 -1
    pidgin/pidginaccountsenabledmenu.c
    • --- a/libpurple/protocols/demo/purpledemoprotocolactions.c Thu Jan 05 21:14:08 2023 -0600
    +++ b/libpurple/protocols/demo/purpledemoprotocolactions.c Thu Jan 05 22:39:17 2023 -0600
    @@ -222,7 +222,8 @@
    }
    static GMenu *
    -purple_demo_protocol_get_menu(G_GNUC_UNUSED PurpleProtocolActions *actions)
    +purple_demo_protocol_get_menu(G_GNUC_UNUSED PurpleProtocolActions *actions,
    + G_GNUC_UNUSED PurpleConnection *connection)
    {
    GMenu *menu = NULL;
    GMenuItem *item = NULL;
    --- a/libpurple/protocols/gg/gg.c Thu Jan 05 21:14:08 2023 -0600
    +++ b/libpurple/protocols/gg/gg.c Thu Jan 05 22:39:17 2023 -0600
    @@ -1167,7 +1167,8 @@
    }
    static GMenu *
    -ggp_protocol_actions_get_menu(PurpleProtocolActions *actions) {
    +ggp_protocol_actions_get_menu(G_GNUC_UNUSED PurpleProtocolActions *actions,
    + G_GNUC_UNUSED PurpleConnection *connection) {
    GMenu *menu = NULL, *submenu = NULL;
    GMenuItem *item = NULL;
    --- a/libpurple/protocols/irc/irc.c Thu Jan 05 21:14:08 2023 -0600
    +++ b/libpurple/protocols/irc/irc.c Thu Jan 05 22:39:17 2023 -0600
    @@ -473,7 +473,9 @@
    }
    static GMenu *
    -irc_protocol_actions_get_menu(PurpleProtocolActions *actions) {
    +irc_protocol_actions_get_menu(G_GNUC_UNUSED PurpleProtocolActions *actions,
    + G_GNUC_UNUSED PurpleConnection *connection)
    +{
    GMenu *menu = NULL;
    GMenuItem *item = NULL;
    --- a/libpurple/protocols/jabber/jabber.c Thu Jan 05 21:14:08 2023 -0600
    +++ b/libpurple/protocols/jabber/jabber.c Thu Jan 05 22:39:17 2023 -0600
    @@ -2058,7 +2058,9 @@
    }
    static GMenu *
    -xmpp_protocol_actions_get_menu(G_GNUC_UNUSED PurpleProtocolActions *actions) {
    +xmpp_protocol_actions_get_menu(G_GNUC_UNUSED PurpleProtocolActions *actions,
    + G_GNUC_UNUSED PurpleConnection *connection)
    +{
    GMenu *menu = NULL;
    GMenuItem *item = NULL;
    --- a/libpurple/purpleprotocolactions.c Thu Jan 05 21:14:08 2023 -0600
    +++ b/libpurple/purpleprotocolactions.c Thu Jan 05 22:39:17 2023 -0600
    @@ -72,7 +72,8 @@
    }
    GMenu *
    -purple_protocol_actions_get_menu(PurpleProtocolActions *actions)
    +purple_protocol_actions_get_menu(PurpleProtocolActions *actions,
    + PurpleConnection *connection)
    {
    PurpleProtocolActionsInterface *iface = NULL;
    @@ -80,7 +81,7 @@
    iface = PURPLE_PROTOCOL_ACTIONS_GET_IFACE(actions);
    if(iface != NULL && iface->get_menu != NULL) {
    - return iface->get_menu(actions);
    + return iface->get_menu(actions, connection);
    }
    return NULL;
    --- a/libpurple/purpleprotocolactions.h Thu Jan 05 21:14:08 2023 -0600
    +++ b/libpurple/purpleprotocolactions.h Thu Jan 05 22:39:17 2023 -0600
    @@ -73,7 +73,7 @@
    GActionGroup *(*get_action_group)(PurpleProtocolActions *actions, PurpleConnection *connection);
    - GMenu *(*get_menu)(PurpleProtocolActions *actions);
    + GMenu *(*get_menu)(PurpleProtocolActions *actions, PurpleConnection *connection);
    /*< private >*/
    gpointer reserved[4];
    @@ -109,14 +109,15 @@
    /**
    * purple_protocol_actions_get_menu:
    * @actions: The [iface@ProtocolActions] instance.
    + * @connection: (nullable): The [class@Connection] instance.
    *
    - * Gets the menu used to display the protocol actions.
    + * Gets the menu used to display the protocol actions for @connection.
    *
    * Returns: (transfer full): The menu to display or %NULL.
    *
    * Since: 3.0.0
    */
    -GMenu *purple_protocol_actions_get_menu(PurpleProtocolActions *actions);
    +GMenu *purple_protocol_actions_get_menu(PurpleProtocolActions *actions, PurpleConnection *connection);
    G_END_DECLS
    --- a/pidgin/pidginaccountsenabledmenu.c Thu Jan 05 21:14:08 2023 -0600
    +++ b/pidgin/pidginaccountsenabledmenu.c Thu Jan 05 22:39:17 2023 -0600
    @@ -258,7 +258,7 @@
    PurpleProtocolActions *actions = PURPLE_PROTOCOL_ACTIONS(protocol);
    GMenu *protocol_menu = NULL;
    - protocol_menu = purple_protocol_actions_get_menu(actions);
    + protocol_menu = purple_protocol_actions_get_menu(actions, connection);
    if(G_IS_MENU(protocol_menu)) {
    g_menu_insert_section(submenu, 1, NULL,
    G_MENU_MODEL(protocol_menu));