changeset f6bd1672e3c1 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=f6bd1672e3c1 description: put connect() into connections.py
diffstat:
src/common/connection.py | 9 ++++++++- src/whiteboardwidget.py | 15 +++------------ 2 files changed, 11 insertions(+), 13 deletions(-)
diffs (58 lines):
diff -r dea6760d1bb5 -r f6bd1672e3c1 src/common/connection.py --- a/src/common/connection.py Mon Jul 06 08:06:10 2009 +0200 +++ b/src/common/connection.py Mon Jul 06 01:18:22 2009 -0700 @@ -1951,7 +1951,14 @@
self.connection.SendAndCallForResponse(iq, _on_response) - def send_sxe(self, message): + def send_whiteboard_connect(self, jid, sid): + + message = common.xmpp.Node(node="<message to='%s' xmlns='jabber:client'/>" + % jid) + sxe = message.addChild(name='sxe', attrs={'session':sid}, + namespace='urn:xmpp:tmp:sxe') + sxe.addChild(name='connect') + self.connection.send(message)
# END Connection diff -r dea6760d1bb5 -r f6bd1672e3c1 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Mon Jul 06 08:06:10 2009 +0200 +++ b/src/whiteboardwidget.py Mon Jul 06 01:18:22 2009 -0700 @@ -100,7 +100,7 @@ print 'test' if event.keyval == 'p': self.image.print_xml() - + class SVGObject(): ''' A class to store the svg document and make changes to it. Stores items in a tuple that's (minidom node, goocanvas object).''' @@ -158,7 +158,6 @@ self.sid = ''.join([choice(chars) for i in range(7)]) else: self.sid = sid - self.connect()
def rid(self): rid = str(self.last_rid) @@ -167,16 +166,8 @@
def connect(self): # connect to the message - - # FIXME Create a function in src/common/connection.py - message = Node(node="<message to='%s' xmlns='jabber:client'/>" - % self.contact.get_full_jid()) - sxe = message.addChild(name='sxe', attrs={'session':self.sid}, - namespace='urn:xmpp:tmp:sxe') - sxe.addChild(name='connect') - - gajim.connections[self.account].send_sxe(message) - + gajim.connections[self.account].send_whiteboard_connect( + self.contact.get_full_jid(), self.sid) def encode(self, xml): # encodes it sendable string