# HG changeset patch
# User Ralph Meijer <ralphm@ik.nu>
# Date 1113308837 0
# Node ID 8527bce09862be46da6b4391215bce44a07b3a95
# Parent  4f0113adb7ed066bdda3245dd0378b3b5900b972
Changed to adapt to new API of backend's add_subscription.

diff -r 4f0113adb7ed -r 8527bce09862 idavoll/pubsub.py
--- a/idavoll/pubsub.py	Tue Apr 12 12:26:05 2005 +0000
+++ b/idavoll/pubsub.py	Tue Apr 12 12:27:17 2005 +0000
@@ -268,14 +268,14 @@
 
         requestor = jid.JID(iq["from"]).userhostJID()
         d = self.backend.subscribe(node_id, subscriber, requestor)
-        d.addCallback(self.return_subscription)
+        d.addCallback(self.return_subscription, subscriber)
         return d
 
-    def return_subscription(self, result):
+    def return_subscription(self, result, subscriber):
         reply = domish.Element((NS_PUBSUB, "pubsub"))
         entity = reply.addElement("entity")
         entity["node"] = result["node"]
-        entity["jid"] = result["jid"].full()
+        entity["jid"] = subscriber.full()
         entity["affiliation"] = result["affiliation"] or 'none'
         entity["subscription"] = result["subscription"]
         return [reply]