From 46fbda6caa1f49480bf3237557318676cb3a1df5 Mon Sep 17 00:00:00 2001
From: Dimitur Kirov <dkirov@gmail.com>
Date: Sat, 30 Jul 2005 10:59:15 +0000
Subject: [PATCH] import socks5 from xmpp

---
 src/common/connection.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common/connection.py b/src/common/connection.py
index 15d735567..3eac107d7 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -4,6 +4,7 @@
 ##	- Yann Le Boulanger <asterix@lagaule.org>
 ##	- Vincent Hanquez <tab@snarc.org>
 ##	- Nikos Kouremenos <nkour@jabber.org>
+##  - Dimitur Kirov <dkirov@gmail.com>
 ##
 ##	Copyright (C) 2003-2005 Gajim Team
 ##
@@ -24,7 +25,7 @@ import sre
 import traceback
 import threading
 import select
-import socks5
+
 
 from calendar import timegm
 
@@ -33,6 +34,7 @@ import common.xmpp
 from common import helpers
 from common import gajim
 from common import GnuPG
+from xmpp import socks5
 USE_GPG = GnuPG.USE_GPG
 
 from common import i18n