From 0c8b0bbde2d56b8f29a7f00dbb8800259c94f338 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 9 May 2005 10:30:34 +0000
Subject: [PATCH] /me\n or /me /t is also valid !

---
 src/common/connection.py | 46 ++++++++++++++++++++--------------------
 src/common/gajim.py      |  1 +
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/common/connection.py b/src/common/connection.py
index a5df9981b..b03ab5d2e 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -767,31 +767,31 @@ class Connection:
 			proxy = {'host': proxyhost, 'port': proxyport}
 		else:
 			proxy = None
-		c = common.xmpp.Client(server = hostname, debug = [])
-		try:
-			c.connect(proxy = proxy)
-		except:
-			gajim.log.debug('Couldn\'t connect to %s' % hostname)
-			self.dispatch('ERROR', _('Couldn\'t connect to ') + hostname)
-			return 0
+		c = common.xmpp.Client(server = hostname)
+#		try:
+		c.connect(proxy = proxy)
+#		except:
+#			gajim.log.debug('Couldn\'t connect to %s' % hostname)
+#			self.dispatch('ERROR', _('Couldn\'t connect to ') + hostname)
+#			return 0
+#		else:
+		gajim.log.debug('Connected to server')
+		req = common.xmpp.features.getRegInfo(c, hostname).asDict() # FIXME! This blocks!
+		req['username'] = login
+		req['password'] = password
+		if not common.xmpp.features.register(c, hostname,req): #FIXME: error
+			self.dispatch('ERROR', _('Error: ') + c.lastErr)
 		else:
-			gajim.log.debug(_('Connected to server'))
-			req = common.xmpp.features.getRegInfo(c, hostname).asDict() # FIXME! This blocks!
-			req['username'] = login
-			req['password'] = password
-			if not common.xmpp.features.register(c, hostname,req): #FIXME: error
-				self.dispatch('ERROR', _('Error: ') + c.lastErr)
+			self.name = name
+			self.connected = 0
+			self.password = password
+			if USE_GPG:
+				self.gpg = GnuPG.GnuPG()
+				gajim.config.set('usegpg', True)
 			else:
-				self.name = name
-				self.connected = 0
-				self.password = password
-				if USE_GPG:
-					self.gpg = GnuPG.GnuPG()
-					gajim.config.set('usegpg', True)
-				else:
-					gajim.config.set('usegpg', False)
-				self.dispatch('ACC_OK', (hostname, login, password, name,
-					resource, prio, use_proxy, proxyhost, proxyport))
+				gajim.config.set('usegpg', False)
+			self.dispatch('ACC_OK', (hostname, login, password, name,
+				resource, prio, use_proxy, proxyhost, proxyport))
 
 	def account_changed(self, new_name):
 		self.name = new_name
diff --git a/src/common/gajim.py b/src/common/gajim.py
index a16c1824f..135411596 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -25,4 +25,5 @@ version = '0.7'
 config = common.config.Config()
 connections = {}
 log = logging.getLogger('Gajim')
+log.setLevel(logging.DEBUG)
 logger = common.logger.Logger()