name is saved when subscribing a new contact

2 files changed, 13 insertions, 6 deletions

diff --git a/common/hub.py b/common/hub.py
index ec058b8ed..b556d89ff 100644
--- a/common/hub.py
+++ b/common/hub.py
@@ -28,7 +28,7 @@ class GajimHub:
     def __init__(self):
         self.queues = {}
         """ {event1:[queue1, queue2]} """
-        self.events = {'NOTIFY':[], 'MSG':[], 'ROSTER':[]}
+        self.events = {}
         self.queueIn = self.newQueue('in', 100)
     # END __init__
 
@@ -49,7 +49,10 @@ class GajimHub:
     def register(self, name, event):
         """ Records a plugin from an event """
         qu = self.queues[name]
-        self.events[event].append(qu)
+	if self.events.has_key(event) :
+		self.events[event].append(qu)
+	else :
+		self.events[event] = [qu]
     # END register
 
     def sendPlugin(self, event, data):
diff --git a/common/jabber.py b/common/jabber.py
index 515c23756..943f925f1 100644
--- a/common/jabber.py
+++ b/common/jabber.py
@@ -62,7 +62,7 @@ An example of usage for a simple client would be ( only psuedo code !)
 
 """
 
-# $Id: jabber.py,v 1.30 2003/02/20 10:22:33 shire Exp $
+# $Id: jabber.py,v 1.1.1.1 2003/10/22 18:45:18 tab Exp $
 
 import xmlstream
 import sha, time
@@ -722,12 +722,16 @@ class Client(Connection):
         """
         iq = Iq(type='set')
         item = iq.setQuery(NS_ROSTER).insertTag('item')
-        item.putAtrr('jid', str(jid))
-        if name != None: item.putAtrr('name', name)
+        item.putAttr('jid', str(jid))
+        if name != None: item.putAttr('name', name)
         if groups != None:
             for group in groups:
                 item.insertTag('group').insertData(group)
-        dummy = self.sendAndWaitForResponse(iq) # Do we need to wait??
+	ID = self.getAnID()
+	iq.setID(ID)
+	ID = str(ID)
+	self.send(iq)
+#        dummy = self.SendAndWaitForResponse(iq) # Do we need to wait??
 
 
     def removeRosterItem(self,jid):