Opened 10 years ago

Closed 10 years ago

#7974 closed patch (fixed)

jabber_set_buddy_icon braces wrong

Reported by: darkrain42 Owned by: deryni
Milestone: 2.5.4 Component: XMPP
Version: 2.5.3 Keywords:


The else statements in jabber_set_buddy_icon are backwards. If the user tries to unset the buddy icon, it throws a "received non-png data" error, but if the prpl is passed non-png data, it unsets the avatar.

Attached patch reverses the two else blocks.

Attachments (2)

buddy-icons.patch (1.8 KB) - added by darkrain42 10 years ago.
vcard-patch.patch (1.3 KB) - added by darkrain42 10 years ago.

Download all attachments as: .zip

Change History (5)

Changed 10 years ago by darkrain42

Changed 10 years ago by darkrain42

comment:1 Changed 10 years ago by darkrain42

I also realized that Pidgin doesn't unset a vcard-based avatar. jabber_set_info only removes the <PHOTO> node if the account has an image set.

See attached patch, which removes the node (and adds a note about something that both deryni and I noticed -- see elb's vcard)

comment:2 Changed 10 years ago by paul@…

(In f65f1d9e6c755034926183d758e41e4374fd1291):
Paul noticed that the conditional blocks here were backwards. I'm surprised no one seems to have noticed this before now.

References #7974

comment:3 Changed 10 years ago by paul@…

  • Milestone set to 2.5.4
  • Resolution set to fixed
  • Status changed from new to closed

(In 91c54e1cd7a33198f97836ac32ab8f3f3111efe6):
Allow us to remove vCard avatars when the PurpleAccount? doesn't have one specified.

Closes #7974

Note: See TracTickets for help on using tickets.
All information, including names and email addresses, entered onto this website or sent to mailing lists affiliated with this website will be public. Do not post confidential information, especially passwords!