From 7bbbb738fdb233f4ad91ffdd7d9247b28849d715 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Tue, 13 Jun 2017 18:14:59 +0200 Subject: Get rid of manual storage objects for delegates --- .../src/module/xep/0049_private_xml_storage.vala | 26 +++++++++------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'xmpp-vala/src/module/xep/0049_private_xml_storage.vala') diff --git a/xmpp-vala/src/module/xep/0049_private_xml_storage.vala b/xmpp-vala/src/module/xep/0049_private_xml_storage.vala index fc8f5b4c..26a297b4 100644 --- a/xmpp-vala/src/module/xep/0049_private_xml_storage.vala +++ b/xmpp-vala/src/module/xep/0049_private_xml_storage.vala @@ -8,18 +8,22 @@ namespace Xmpp.Xep.PrivateXmlStorage { public class Module : XmppStreamModule { public static ModuleIdentity IDENTITY = new ModuleIdentity(NS_URI, "0049_private_xml_storage"); - [CCode (has_target = false)] public delegate void OnSuccess(XmppStream stream, Object? reference); - public void store(XmppStream stream, StanzaNode node, OnSuccess listener, Object? reference) { + public delegate void OnSuccess(XmppStream stream); + public void store(XmppStream stream, StanzaNode node, owned OnSuccess listener) { StanzaNode queryNode = new StanzaNode.build("query", NS_URI).add_self_xmlns().put_node(node); Iq.Stanza iq = new Iq.Stanza.set(queryNode); - stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, on_store_response, Tuple.create(listener, reference)); + stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, (stream, iq) => { + listener(stream); + }); } - [CCode (has_target = false)] public delegate void OnResponse(XmppStream stream, StanzaNode node, Object? reference); - public void retrieve(XmppStream stream, StanzaNode node, OnResponse listener, Object? reference) { + public delegate void OnResponse(XmppStream stream, StanzaNode node); + public void retrieve(XmppStream stream, StanzaNode node, owned OnResponse listener) { StanzaNode queryNode = new StanzaNode.build("query", NS_URI).add_self_xmlns().put_node(node); Iq.Stanza iq = new Iq.Stanza.get(queryNode); - stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, on_retrieve_response, Tuple.create(listener, reference)); + stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, (stream, iq) => { + listener(stream, iq.stanza.get_subnode("query", NS_URI)); + }); } public override void attach(XmppStream stream) { @@ -34,15 +38,5 @@ namespace Xmpp.Xep.PrivateXmlStorage { public override string get_ns() { return NS_URI; } public override string get_id() { return IDENTITY.id; } - - private static void on_store_response(XmppStream stream, Iq.Stanza iq, Object? o) { - Tuple tuple = o as Tuple; - tuple.a(stream, tuple.b); - } - - private static void on_retrieve_response(XmppStream stream, Iq.Stanza iq, Object? o) { - Tuple tuple = o as Tuple; - tuple.a(stream, iq.stanza.get_subnode("query", NS_URI), tuple.b); - } } } -- cgit v1.2.3-54-g00ecf