Get rid of manual storage objects for delegates

1 files changed, 10 insertions, 16 deletions

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<Module> IDENTITY = new ModuleIdentity<Module>(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<OnSuccess, Object> tuple = o as Tuple<OnSuccess, Object>;
-            tuple.a(stream, tuple.b);
-        }
-
-        private static void on_retrieve_response(XmppStream stream, Iq.Stanza iq, Object? o) {
-            Tuple<OnResponse, Object> tuple = o as Tuple<OnResponse, Object>;
-            tuple.a(stream, iq.stanza.get_subnode("query", NS_URI), tuple.b);
-        }
     }
 }