From dffb2c308b9c26a26f4a8dd98192011e40929d44 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 4 Jan 2010 11:58:42 +0100
Subject: [PATCH] remove duplicate function

---
 src/common/gajim.py | 5 -----
 src/gajim.py        | 1 +
 2 files changed, 1 insertion(+), 5 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/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: