From b43d9ffd5eb88649c71eca28eddd74db346c76d1 Mon Sep 17 00:00:00 2001
From: Stefan Bethge <stefan@lanpartei.de>
Date: Tue, 27 Jun 2006 23:09:21 +0000
Subject: [PATCH] fix module imports (woops :)
---
src/common/zeroconf/client_zeroconf.py | 2 +-
src/common/zeroconf/connection_handlers_zeroconf.py | 2 +-
src/common/zeroconf/connection_zeroconf.py | 6 +++---
src/common/zeroconf/roster_zeroconf.py | 2 +-
src/gajim.py | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/common/zeroconf/client_zeroconf.py b/src/common/zeroconf/client_zeroconf.py
index f4b98aab98..d189a7d22d 100644
--- a/src/common/zeroconf/client_zeroconf.py
+++ b/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):
diff --git a/src/common/zeroconf/connection_handlers_zeroconf.py b/src/common/zeroconf/connection_handlers_zeroconf.py
index f0f17b7df5..d73c385baf 100644
--- a/src/common/zeroconf/connection_handlers_zeroconf.py
+++ b/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
diff --git a/src/common/zeroconf/connection_zeroconf.py b/src/common/zeroconf/connection_zeroconf.py
index b33685e6ca..2a3fabfc7a 100644
--- a/src/common/zeroconf/connection_zeroconf.py
+++ b/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
diff --git a/src/common/zeroconf/roster_zeroconf.py b/src/common/zeroconf/roster_zeroconf.py
index aeda3fb67a..503b0a2e18 100644
--- a/src/common/zeroconf/roster_zeroconf.py
+++ b/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):
diff --git a/src/gajim.py b/src/gajim.py
index 63b5dcb6ce..35de76b8b6 100755
--- a/src/gajim.py
+++ b/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)
--
GitLab