merge local changes

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)

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):

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
 

src/gajim.py

@@ -382,6 +382,7 @@ if __name__ == '__main__':
 		# Session Management support
 		try:
 			import gnome.ui
+			raise ImportError
 		except ImportError:
 			pass
 		else: