diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2010-01-04 20:46:20 +0300 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2010-01-04 20:46:20 +0300 |
| commit | d712a2d87972e7799a8c9e19d9560e4422c77be5 (patch) | |
| tree | 261785a8dceb7f44b53b10b692f9ec9be07c935f /src | |
| parent | 1a645064195829771752cecc9f27d978d7a99579 (diff) | |
| parent | 400390acaa95cb0d127d7cac8b47a2623a97a245 (diff) | |
merge local changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/gajim.py | 5 | ||||
| -rw-r--r-- | src/common/jingle_content.py | 2 | ||||
| -rw-r--r-- | src/common/jingle_transport.py | 4 | ||||
| -rw-r--r-- | src/gajim.py | 1 |
4 files changed, 5 insertions, 7 deletions
diff --git a/src/common/gajim.py b/src/common/gajim.py index 3c33d69af..aef963e8b 100644 --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -223,11 +223,6 @@ def get_server_from_jid(jid): pos = jid.find('@') + 1 # after @ return jid[pos:] -def get_resource_from_jid(jid): - tokens = jid.split('/', 1) - if len(tokens) > 1: - return tokens[1] - def get_name_and_server_from_jid(jid): name = get_nick_from_jid(jid) server = get_server_from_jid(jid) diff --git a/src/common/jingle_content.py b/src/common/jingle_content.py index a3a8d9d80..7331d82c7 100644 --- a/src/common/jingle_content.py +++ b/src/common/jingle_content.py @@ -118,7 +118,7 @@ class JingleContent(object): Send a transport candidate for a previously defined transport. """ content = self.__content() - content.addChild(self.transport.make_transport([candidate])) + content.addChild(node=self.transport.make_transport([candidate])) self.session.send_transport_info(content) def __fill_jingle_stanza(self, stanza, content, error, action): diff --git a/src/common/jingle_transport.py b/src/common/jingle_transport.py index acf97ea11..82a0cb987 100644 --- a/src/common/jingle_transport.py +++ b/src/common/jingle_transport.py @@ -60,6 +60,8 @@ class JingleTransport(object): """ if not candidates: candidates = self._iter_candidates() + else: + candidates = (self.make_candidate(candidate) for candidate in candidates) transport = xmpp.Node('transport', payload=candidates) return transport @@ -145,4 +147,4 @@ class JingleTransportICEUDP(JingleTransport): transports[xmpp.NS_JINGLE_ICE_UDP] = JingleTransportICEUDP -# vim: se ts=3:
\ No newline at end of file +# vim: se ts=3: diff --git a/src/gajim.py b/src/gajim.py index 9468a971b..2f2689ecb 100644 --- a/src/gajim.py +++ b/src/gajim.py @@ -382,6 +382,7 @@ if __name__ == '__main__': # Session Management support try: import gnome.ui + raise ImportError except ImportError: pass else: |