diff --git a/src/common/gajim.py b/src/common/gajim.py
index 3c33d69af950435b7d1fe84cc6ef6dd403bfb907..aef963e8b6d51f10c5816b7ebcedd082fe4ae0a2 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 9468a971b102ac30d695f5011fbc5e987bebb2cb..2f2689ecb090d461354570ebc606de0f48f59981 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: