fix module imports (woops :)

src/common/zeroconf/client_zeroconf.py

@@ -1,5 +1,5 @@
 
-from common import roster_zeroconf
+from common.zeroconf import roster_zeroconf
 
 class ClientZeroconf:
 	def __init__(self, zeroconf):

src/common/zeroconf/connection_handlers_zeroconf.py

@@ -26,7 +26,7 @@ import sys
 
 from calendar import timegm
 
-import socks5
+#import socks5
 import common.xmpp
 
 from common import GnuPG

src/common/zeroconf/connection_zeroconf.py

@@ -39,9 +39,9 @@ import gobject
 from common import helpers
 from common import gajim
 from common import GnuPG
-from common import zeroconf
-from common import connection_handlers_zeroconf
-from common import client_zeroconf
+from common.zeroconf import zeroconf
+from common.zeroconf import connection_handlers_zeroconf
+from common.zeroconf import client_zeroconf
 from connection_handlers_zeroconf import *
 
 USE_GPG = GnuPG.USE_GPG

src/common/zeroconf/roster_zeroconf.py

@@ -1,4 +1,4 @@
-from common import zeroconf
+from common.zeroconf import zeroconf
 
 class Roster:
 	def __init__(self, zeroconf):

src/gajim.py

@@ -39,7 +39,7 @@ from chat_control import ChatControlBase
 
 from common import exceptions
 from common import i18n
-from common import connection_zeroconf
+from common.zeroconf import connection_zeroconf
 
 i18n.init()
 _ = i18n._
@@ -1741,7 +1741,7 @@ class Interface:
 		self.register_handlers()
 		for account in gajim.config.get_per('accounts'):
 			if account == 'zeroconf':
-				gajim.connections[account] = common.connection_zeroconf.ConnectionZeroconf(account)
+				gajim.connections[account] = common.zeroconf.connection_zeroconf.ConnectionZeroconf(account)
 			else:
 				gajim.connections[account] = common.connection.Connection(account)