pidgin/pidgin

Update PurpleAccountManager to connect/disconnect accounts when enabled/disabled

2 weeks ago, Gary Kramlich
a82453779416
Parents f7e2506d8308
Children 3e480ee2d7ee
Update PurpleAccountManager to connect/disconnect accounts when enabled/disabled

I'm not sure why we didn't do this before, but now that we have the online
property it makes much more sense for the account manager to actually connect
and disconnect the accounts.

Testing Done:
Bought the turtles pizza and toggled a demo account a few times.

Reviewed at https://reviews.imfreedom.org/r/3098/
1 files changed, 31 insertions(+), 1 deletions(-)
  • +31 -1
    libpurple/purpleaccountmanager.c
    • --- a/libpurple/purpleaccountmanager.c Thu Apr 11 23:12:12 2024 -0500
    +++ b/libpurple/purpleaccountmanager.c Fri Apr 12 00:53:01 2024 -0500
    @@ -59,6 +59,29 @@
    /******************************************************************************
    * Callbacks
    *****************************************************************************/
    +
    +/* We monitor the enabled property for all accounts in the manager, to
    + * automatically connect or disconnect them.
    + */
    +static void
    +purple_account_manager_account_enabled_cb(GObject *source,
    + G_GNUC_UNUSED GParamSpec *pspec,
    + gpointer data)
    +{
    + PurpleAccount *account = PURPLE_ACCOUNT(source);
    + gboolean online = FALSE;
    +
    + online = purple_account_manager_get_online(data);
    +
    + if(purple_account_get_enabled(account) && online) {
    + purple_account_connect(account);
    + } else {
    + if(purple_account_is_connected(account)) {
    + purple_account_disconnect(account);
    + }
    + }
    +}
    +
    /* This is the callback for the notify signal on accounts. It re-emits the
    * signal as coming from the manager and passes the account as a parameter to
    * the callback. It supports details as well so you can use
    @@ -457,6 +480,10 @@
    */
    g_ptr_array_insert(manager->accounts, 0, g_object_ref(account));
    + g_signal_connect_object(account, "notify::enabled",
    + G_CALLBACK(purple_account_manager_account_enabled_cb),
    + manager, 0);
    +
    /* Connect to the signals of the account that we want to propagate. */
    g_signal_connect_object(account, "notify",
    G_CALLBACK(purple_account_manager_account_notify_cb),
    @@ -476,7 +503,7 @@
    g_signal_emit(manager, signals[SIG_ADDED], 0, account);
    g_list_model_items_changed(G_LIST_MODEL(manager), 0, 0, 1);
    - if(manager->online) {
    + if(manager->online && purple_account_get_enabled(account)) {
    purple_account_connect(account);
    }
    }
    @@ -497,6 +524,9 @@
    /* Disconnect all the signals we added for the account. */
    g_signal_handlers_disconnect_by_func(account,
    + purple_account_manager_account_enabled_cb,
    + manager);
    + g_signal_handlers_disconnect_by_func(account,
    purple_account_manager_account_notify_cb,
    manager);
    g_signal_handlers_disconnect_by_func(account,