From 782ae4c049e2b6fab13d7453cbb0e74610e7d200 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Fri, 12 Jan 2018 21:03:09 +0100 Subject: Move Jid class to xmpp-vala, partially refactor namespace --- xmpp-vala/src/module/xep/0084_user_avatars.vala | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'xmpp-vala/src/module/xep/0084_user_avatars.vala') diff --git a/xmpp-vala/src/module/xep/0084_user_avatars.vala b/xmpp-vala/src/module/xep/0084_user_avatars.vala index 2b37f485..92ac54e2 100644 --- a/xmpp-vala/src/module/xep/0084_user_avatars.vala +++ b/xmpp-vala/src/module/xep/0084_user_avatars.vala @@ -1,5 +1,3 @@ -using Xmpp.Core; - namespace Xmpp.Xep.UserAvatars { private const string NS_URI = "urn:xmpp:avatar"; private const string NS_URI_DATA = NS_URI + ":data"; @@ -8,7 +6,7 @@ namespace Xmpp.Xep.UserAvatars { public class Module : XmppStreamModule { public static ModuleIdentity IDENTITY = new ModuleIdentity(NS_URI, "0084_user_avatars"); - public signal void received_avatar(XmppStream stream, string jid, string id); + public signal void received_avatar(XmppStream stream, Jid jid, string id); private PixbufStorage storage; @@ -40,7 +38,7 @@ namespace Xmpp.Xep.UserAvatars { public override void detach(XmppStream stream) { } - public void on_pupsub_event(XmppStream stream, string jid, string id, StanzaNode? node) { + public void on_pupsub_event(XmppStream stream, Jid jid, string id, StanzaNode? node) { StanzaNode? info_node = node.get_subnode("info", NS_URI_METADATA); if (info_node == null || info_node.get_attribute("type") != "image/png") return; if (storage.has_image(id)) { @@ -53,7 +51,7 @@ namespace Xmpp.Xep.UserAvatars { public override string get_ns() { return NS_URI; } public override string get_id() { return IDENTITY.id; } - private void on_pubsub_data_response(XmppStream stream, string jid, string? id, StanzaNode? node) { + private void on_pubsub_data_response(XmppStream stream, Jid jid, string? id, StanzaNode? node) { if (node == null) return; storage.store(id, Base64.decode(node.get_string_content())); stream.get_module(Module.IDENTITY).received_avatar(stream, jid, id); -- cgit v1.2.3-54-g00ecf