pidgin/pidgin

Convert the libpurple plugins to use PurpleConversationManager

2021-07-22, Gary Kramlich
7988932faf91
Parents f77cf4694364
Children d92defc9ba95
Convert the libpurple plugins to use PurpleConversationManager

Testing Done:
Compiled

Reviewed at https://reviews.imfreedom.org/r/800/
3 files changed, 15 insertions(+), 6 deletions(-)
  • +9 -4
    libpurple/plugins/autoaccept.c
  • +3 -1
    libpurple/plugins/psychic.c
  • +3 -1
    libpurple/plugins/statenotify.c
    • --- a/libpurple/plugins/autoaccept.c Thu Jul 22 16:39:08 2021 -0500
    +++ b/libpurple/plugins/autoaccept.c Thu Jul 22 22:32:11 2021 -0500
    @@ -70,14 +70,19 @@
    auto_accept_complete_cb(PurpleXfer *xfer, G_GNUC_UNUSED GParamSpec *pspec,
    G_GNUC_UNUSED gpointer data)
    {
    + PurpleConversationManager *manager = NULL;
    +
    if (purple_xfer_get_status(xfer) != PURPLE_XFER_STATUS_DONE) {
    return;
    }
    - if (purple_prefs_get_bool(PREF_NOTIFY) &&
    - !purple_conversations_find_im_with_account(
    - purple_xfer_get_remote_user(xfer),
    - purple_xfer_get_account(xfer))) {
    + manager = purple_conversation_manager_get_default();
    +
    + if(purple_prefs_get_bool(PREF_NOTIFY) &&
    + !purple_conversation_manager_find_im(manager,
    + purple_xfer_get_account(xfer),
    + purple_xfer_get_remote_user(xfer)))
    + {
    char *message = g_strdup_printf(_("Autoaccepted file transfer of \"%s\" from \"%s\" completed."),
    purple_xfer_get_filename(xfer), purple_xfer_get_remote_user(xfer));
    purple_notify_info(NULL, _("Autoaccept complete"), message,
    --- a/libpurple/plugins/psychic.c Thu Jul 22 16:39:08 2021 -0500
    +++ b/libpurple/plugins/psychic.c Thu Jul 22 22:32:11 2021 -0500
    @@ -42,6 +42,7 @@
    static void
    buddy_typing_cb(PurpleAccount *acct, const char *name, void *data) {
    PurpleConversation *im;
    + PurpleConversationManager *manager;
    if(purple_prefs_get_bool(PREF_STATUS) &&
    ! purple_status_is_available(purple_account_get_active_status(acct))) {
    @@ -60,7 +61,8 @@
    return;
    }
    - im = purple_conversations_find_im_with_account(name, acct);
    + manager = purple_conversation_manager_get_default();
    + im = purple_conversation_manager_find_im(manager, acct, name);
    if(! im) {
    purple_debug_info("psychic", "no previous conversation exists\n");
    im = purple_im_conversation_new(acct, name);
    --- a/libpurple/plugins/statenotify.c Thu Jul 22 16:39:08 2021 -0500
    +++ b/libpurple/plugins/statenotify.c Thu Jul 22 22:32:11 2021 -0500
    @@ -29,6 +29,7 @@
    {
    PurpleAccount *account = NULL;
    PurpleConversation *im;
    + PurpleConversationManager *manager;
    const char *who;
    char buf[256];
    char *escaped;
    @@ -37,7 +38,8 @@
    account = purple_buddy_get_account(buddy);
    buddy_name = purple_buddy_get_name(buddy);
    - im = purple_conversations_find_im_with_account(buddy_name, account);
    + manager = purple_conversation_manager_get_default();
    + im = purple_conversation_manager_find_im(manager, account, buddy_name);
    if (im == NULL)
    return;