Changeset 711

Timestamp:

07/07/08 16:29:16 (5 months ago)

Author:

sylvain

Message:

ensured contact was removed from roster when unsubscribed

Files:

• oss/jlib/jlib/core/contact.py (modified) (5 diffs)
• oss/jlib/jlib/gui/contact.py (modified) (2 diffs)

oss/jlib/jlib/core/contact.py

@@ -24 +24 @@
-    def __init__(self, parent=None):
-        QAxonObject.__init__(self, parent)
+        QtCore.QObject.connect(self, QtCore.SIGNAL("removeContact(PyQt_PyObject)"),
+                               self.removeContact) 
-
-    def setComponent(self, component):
@@ -29 +31 @@
-        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'inbox')
-        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'pushed')
+        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'remove')
-
-    def getLinkages(self):
@@ -39 +42 @@
-        return dict(rosterdisp=RosterDispatcher(), rosterhandler=self.component), linkages
-
+    def removeContact(self, contact_jid):
+        self._deliver(contact_jid, 'remove')
+
-class jlibContactComponent(component):    
-    Inboxes = {"inbox"        : "headstock.api.contact.Roster instance",
-               "control"      : "stops the component",
-               "pushed"       : "roster stanzas pushed by the server",
+               "remove"       : "",
-               "jid"          : "headstock.api.jid.JID instance received from the server",
-               "ask-activity" : "request activity status to the server for each roster contact"}
@@ -92 +99 @@
-                    self.send(Roster(from_jid=self.from_jid, to_jid=nodeid,
-                                     type=u'result', stanza_id=generate_unique()), 'result')
-
+
+
+
+
+
+
+
+
+
+
+
-            if self.dataReady("inbox"):
-                roster = self.recv("inbox")
@@ -126 +143 @@
-        for nodeid in roster.items:
-            contact = roster.items[nodeid]
+            print contact.groups
-            self.addContact(contact)
-

oss/jlib/jlib/gui/contact.py

@@ -44 +44 @@
-        model.setRoster(roster)
-        
+    def removeContact(self, contact):
+        model = self.contacts.model()
+        contact = model.getContact(model.currentIndex())
+        self.contact.emit(QtCore.SIGNAL("removeContact(PyQt_PyObject)"), contact.jid)
+
-    def removedContact(self, contact):
-        model = self.contacts.model()
@@ -76 +81 @@
-                self.presence.emit(QtCore.SIGNAL("rejectSubscription(PyQt_PyObject)"), contact.jid)
-                self.presence.emit(QtCore.SIGNAL("requestUnsubscription(PyQt_PyObject)"), contact.jid)
+                self.contact.emit(QtCore.SIGNAL("removeContact(PyQt_PyObject)"), contact.jid)
-
-    def contextMenuEvent(self, event):