From c50e5adb7204fb27d765be6ca3da6361e90421a5 Mon Sep 17 00:00:00 2001
From: Goffi <goffi@goffi.org>
Date: Fri, 17 Apr 2015 10:39:41 +0200
Subject: [PATCH] =?UTF-8?q?tmp=20(mam):=20fixed=20name=20shadowing=20+=20g?=
 =?UTF-8?q?etDiscoInfo=20for=20mam=20fix:=20getDiscoInfo=20now=20only=20re?=
 =?UTF-8?q?turns=20MAM=20namespace=20when=20there=20is=20no=20node=20speci?=
 =?UTF-8?q?fied,=20this=20avoid=20having=20mam=20everywhere=20(which=20was?=
 =?UTF-8?q?=20causing=20issues=20in=20S=C3=A0T=20PubSub's=20namespace=20de?=
 =?UTF-8?q?legation)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tmp/wokkel/mam.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/tmp/wokkel/mam.py b/src/tmp/wokkel/mam.py
index abb5ddbd..37996024 100644
--- a/src/tmp/wokkel/mam.py
+++ b/src/tmp/wokkel/mam.py
@@ -200,8 +200,8 @@ class MAMPrefs():
         for attr in ('always', 'never'):
             attr_elt = mam_elt.addElement(attr)
             jids = getattr(self, attr)
-            for jid in jids:
-                attr_elt.addElement('jid', content=jid.full())
+            for jid_ in jids:
+                attr_elt.addElement('jid', content=jid_.full())
         return mam_elt
 
     def render(self, parent):
@@ -521,6 +521,8 @@ class MAMService(XMPPHandler, IQHandlerMixin):
         iq.handled = True
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=''):
+        if nodeIdentifier:
+            return []
         return [disco.DiscoFeature(NS_MAM)]
 
     def getDiscoItems(self, requestor, target, nodeIdentifier=''):