diff options
author | Marvin W <git@larma.de> | 2017-03-09 21:47:50 +0100 |
---|---|---|
committer | Marvin W <git@larma.de> | 2017-03-10 17:33:27 +0100 |
commit | e59b9d2fff347bf779dff1fa8c945bc2a3c59d8b (patch) | |
tree | 07af25dc13f85628b9f9a6c1081fee54252301ce /xmpp-vala/src/module/xep/0084_user_avatars.vala | |
parent | 93fd134a92fb50cc6e8a9b5db3d6f25e84e6fa10 (diff) | |
download | dino-e59b9d2fff347bf779dff1fa8c945bc2a3c59d8b.tar.gz dino-e59b9d2fff347bf779dff1fa8c945bc2a3c59d8b.zip |
Various fixes in vala-xmpp
Diffstat (limited to 'xmpp-vala/src/module/xep/0084_user_avatars.vala')
-rw-r--r-- | xmpp-vala/src/module/xep/0084_user_avatars.vala | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/xmpp-vala/src/module/xep/0084_user_avatars.vala b/xmpp-vala/src/module/xep/0084_user_avatars.vala index 13d19674..575b5d78 100644 --- a/xmpp-vala/src/module/xep/0084_user_avatars.vala +++ b/xmpp-vala/src/module/xep/0084_user_avatars.vala @@ -46,29 +46,27 @@ namespace Xmpp.Xep.UserAvatars { public override void attach(XmppStream stream) { Pubsub.Module.require(stream); - Pubsub.Module.get_module(stream).add_filtered_notification(stream, NS_URI_METADATA, new PubsubEventListenerImpl(storage)); + Pubsub.Module.get_module(stream).add_filtered_notification(stream, NS_URI_METADATA, on_event_result, this); } public override void detach(XmppStream stream) { } - class PubsubEventListenerImpl : Pubsub.EventListener, Object { - PixbufStorage storage; - public PubsubEventListenerImpl(PixbufStorage storage) { this.storage = storage; } - public void on_result(XmppStream stream, string jid, string id, StanzaNode node) { - StanzaNode info_node = node.get_subnode("info", NS_URI_METADATA); - if (info_node.get_attribute("type") != "image/png") return; - if (storage.has_image(id)) { - Module.get_module(stream).received_avatar(stream, jid, id); - } else { - Pubsub.Module.get_module(stream).request(stream, jid, NS_URI_DATA, new PubsubRequestResponseListenerImpl(storage)); - } + + public void on_event_result(XmppStream stream, string jid, string id, StanzaNode node) { + StanzaNode info_node = node.get_subnode("info", NS_URI_METADATA); + if (info_node.get_attribute("type") != "image/png") return; + if (storage.has_image(id)) { + Module.get_module(stream).received_avatar(stream, jid, id); + } else { + Pubsub.Module.get_module(stream).request(stream, jid, NS_URI_DATA, new PubsubRequestResponseListenerImpl(storage)); } } class PubsubRequestResponseListenerImpl : Pubsub.RequestResponseListener, Object { PixbufStorage storage; public PubsubRequestResponseListenerImpl(PixbufStorage storage) { this.storage = storage; } - public void on_result(XmppStream stream, string jid, string id, StanzaNode node) { + public void on_result(XmppStream stream, string jid, string? id, StanzaNode? node) { + if (node == null) return; storage.store(id, Base64.decode(node.get_string_content())); Module.get_module(stream).received_avatar(stream, jid, id); } |