grim/pidgin

Remove NS_AVATAR_0_12_* namespaces

2021-03-13, Arkadiy Illarionov
88c703b00fa7
Parents 8acebbe41fe4
Children 7f0cde300360
Remove NS_AVATAR_0_12_* namespaces

XEP-0084 v0.12 User Avatar is deprecated

Testing Done:
Compile, run.

Bugs closed: PIDGIN-17493

Reviewed at https://reviews.imfreedom.org/r/570/
2 files changed, 0 insertions(+), 40 deletions(-)
  • +0 -4
    libpurple/protocols/jabber/namespaces.h
  • +0 -36
    libpurple/protocols/jabber/useravatar.c
    • --- a/libpurple/protocols/jabber/namespaces.h Wed Mar 10 03:13:38 2021 -0600
    +++ b/libpurple/protocols/jabber/namespaces.h Sat Mar 13 05:15:31 2021 -0600
    @@ -53,10 +53,6 @@
    #define NS_XHTML_IM "http://jabber.org/protocol/xhtml-im"
    #define NS_XHTML "http://www.w3.org/1999/xhtml"
    -/* XEP-0084 v0.12 User Avatar */
    -#define NS_AVATAR_0_12_DATA "http://www.xmpp.org/extensions/xep-0084.html#ns-data"
    -#define NS_AVATAR_0_12_METADATA "http://www.xmpp.org/extensions/xep-0084.html#ns-metadata"
    -
    /* XEP-0084 v1.1 User Avatar */
    #define NS_AVATAR_1_1_DATA "urn:xmpp:avatar:data"
    #define NS_AVATAR_1_1_METADATA "urn:xmpp:avatar:metadata"
    --- a/libpurple/protocols/jabber/useravatar.c Wed Mar 10 03:13:38 2021 -0600
    +++ b/libpurple/protocols/jabber/useravatar.c Sat Mar 13 05:15:31 2021 -0600
    @@ -48,29 +48,6 @@
    update_buddy_metadata);
    }
    -static void
    -remove_avatar_0_12_nodes(JabberStream *js)
    -{
    - /*
    - * This causes ejabberd 2.0.0 to kill the connection unceremoniously.
    - * See https://support.process-one.net/browse/EJAB-623. When adiumx.com
    - * was upgraded, the issue went away.
    - *
    - * I think it makes a lot of sense to not have an avatar at the old
    - * node instead of having something interpreted as "no avatar". When
    - * a contact with an older client logs in, in the latter situation,
    - * there's a race between interpreting the <presence/> vcard-temp:x:update
    - * avatar (non-empty) and the XEP-0084 v0.12 avatar (empty, so show no
    - * avatar for the buddy) which leads to unhappy and confused users.
    - *
    - * A deluge of frustrating "Read error" bug reports may change my mind
    - * about this.
    - * --darkrain42
    - */
    - jabber_pep_delete_node(js, NS_AVATAR_0_12_METADATA);
    - jabber_pep_delete_node(js, NS_AVATAR_0_12_DATA);
    -}
    -
    void jabber_avatar_set(JabberStream *js, PurpleImage *img)
    {
    PurpleXmlNode *publish, *metadata, *item;
    @@ -78,9 +55,6 @@
    if (!js->pep)
    return;
    - /* Hmmm, not sure if this is worth the traffic, but meh */
    - remove_avatar_0_12_nodes(js);
    -
    if (!img) {
    publish = purple_xmlnode_new("publish");
    purple_xmlnode_set_attrib(publish, "node", NS_AVATAR_1_1_METADATA);
    @@ -196,14 +170,6 @@
    }
    static void
    -do_got_own_avatar_0_12_cb(JabberStream *js, const char *from, PurpleXmlNode *items)
    -{
    - if (items)
    - /* It wasn't an error (i.e. 'item-not-found') */
    - remove_avatar_0_12_nodes(js);
    -}
    -
    -static void
    do_got_own_avatar_cb(JabberStream *js, const char *from, PurpleXmlNode *items)
    {
    PurpleXmlNode *item = NULL, *metadata = NULL, *info = NULL;
    @@ -233,8 +199,6 @@
    void jabber_avatar_fetch_mine(JabberStream *js)
    {
    if (js->initial_avatar_hash) {
    - jabber_pep_request_item(js, NULL, NS_AVATAR_0_12_METADATA, NULL,
    - do_got_own_avatar_0_12_cb);
    jabber_pep_request_item(js, NULL, NS_AVATAR_1_1_METADATA, NULL,
    do_got_own_avatar_cb);
    }