From dc29f1d744099b557602337e25dc1796fae64665 Mon Sep 17 00:00:00 2001
From: Dimitur Kirov <dkirov@gmail.com>
Date: Thu, 20 Jul 2006 08:48:29 +0000
Subject: [PATCH] prevent TB from previous commit

---
 src/gajim.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/gajim.py b/src/gajim.py
index b16901538..4ef27ae94 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -397,17 +397,16 @@ class Interface:
 				if not contact1:
 					# presence of another resource of out jid
 					if resource == gajim.connections[account].server_resource:
-						resource = gajim.config.get_per('accounts', account, 'resource')
-					else:
-						contact1 = gajim.contacts.create_contact(jid = ji,
-							name = gajim.nicks[account], groups = [],
-							show = array[1], status = status_message, sub = 'both',
-							ask = 'none', priority = priority, keyID = keyID,
-							resource = resource)
-						old_show = 0
-						gajim.contacts.add_contact(account, contact1)
-						lcontact.append(contact1)
-						self.roster.add_self_contact(account)
+						return
+					contact1 = gajim.contacts.create_contact(jid = ji,
+						name = gajim.nicks[account], groups = [],
+						show = array[1], status = status_message, sub = 'both',
+						ask = 'none', priority = priority, keyID = keyID,
+						resource = resource)
+					old_show = 0
+					gajim.contacts.add_contact(account, contact1)
+					lcontact.append(contact1)
+					self.roster.add_self_contact(account)
 				elif contact1.show in statuss:
 					old_show = statuss.index(contact1.show)
 				if (resources != [''] and (len(lcontact) != 1 or