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 --- xmpp-vala/src/module/xep/0199_ping.vala | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'xmpp-vala/src/module/xep/0199_ping.vala') diff --git a/xmpp-vala/src/module/xep/0199_ping.vala b/xmpp-vala/src/module/xep/0199_ping.vala index 6cb3b4ba..3a5c6797 100644 --- a/xmpp-vala/src/module/xep/0199_ping.vala +++ b/xmpp-vala/src/module/xep/0199_ping.vala @@ -8,10 +8,11 @@ namespace Xmpp.Xep.Ping { public class Module : XmppStreamModule { public static ModuleIdentity IDENTITY = new ModuleIdentity(NS_URI, "0199_ping"); - public void send_ping(XmppStream stream, string jid, ResponseListener? listener) { + public delegate void OnResult(XmppStream stream); + public void send_ping(XmppStream stream, string jid, owned OnResult? listener) { Iq.Stanza iq = new Iq.Stanza.get(new StanzaNode.build("ping", NS_URI).add_self_xmlns()); iq.to = jid; - stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, on_ping_response, listener); + stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, (stream) => { listener(stream); }); } public override void attach(XmppStream stream) { @@ -34,14 +35,5 @@ namespace Xmpp.Xep.Ping { } public void on_iq_set(XmppStream stream, Iq.Stanza iq) { } } - - private static void on_ping_response(XmppStream stream, Iq.Stanza iq, Object? o) { - ResponseListener? listener = o as ResponseListener; - if (listener != null) listener.on_result(stream); - } - } - - public interface ResponseListener : Object { - public abstract void on_result(XmppStream stream); } } -- cgit v1.2.3-70-g09d2