From 1921c43a941591c3a1e8453c16c5605b44fc3cfc Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Sun, 13 Nov 2005 20:25:04 +0000
Subject: [PATCH] try to prevent circular imports

---
 src/config.py           | 3 ++-
 src/dialogs.py          | 4 ++--
 src/gajim.py            | 3 ++-
 src/groupchat_window.py | 3 ++-
 src/roster_window.py    | 3 ++-
 src/vcard.py            | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/config.py b/src/config.py
index ecd402326..3bcd50327 100644
--- a/src/config.py
+++ b/src/config.py
@@ -27,6 +27,7 @@ import common.sleepy
 
 import gtkgui_helpers
 import dialogs
+import vcard
 import cell_renderer_image
 
 try:
@@ -1375,7 +1376,7 @@ _('Without a connection, you can not edit your personal information.')
 			gajim.interface.instances[self.account]['infos'][jid].window.present()
 		else:
 			gajim.interface.instances[self.account]['infos'][jid] = \
-				dialogs.VcardWindow(jid, self.account, True)
+				vcard.VcardWindow(jid, self.account, True)
 			gajim.connections[self.account].request_vcard(jid)
 
 	def on_manage_proxies_button_clicked(self, widget):
diff --git a/src/dialogs.py b/src/dialogs.py
index fdf6501fd..90753bf94 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -24,8 +24,8 @@ import gobject
 import os
 
 import gtkgui_helpers
+import vcard
 
-from vcard import VcardWindow
 from filetransfers_window import FileTransfersWindow
 from gajim_themes_window import GajimThemesWindow
 from advanced import AdvancedConfigurationWindow
@@ -613,7 +613,7 @@ class SubscriptionRequestWindow:
 			gajim.interface.instances[self.account]['infos'][self.jid].window.present()
 		else:
 			gajim.interface.instances[self.account]['infos'][self.jid] = \
-				VcardWindow(self.jid, self.account, True)
+				vcard.VcardWindow(self.jid, self.account, True)
 			#remove the publish / retrieve buttons
 			vcard_xml = gajim.interface.instances[self.account]['infos'][self.jid].xml
 			hbuttonbox = vcard_xml.get_widget('information_hbuttonbox')
diff --git a/src/gajim.py b/src/gajim.py
index c3a6b7401..67d9e75a9 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -155,6 +155,7 @@ class Contact:
 import roster_window
 import systray
 import dialogs
+import vcard
 import config
 import disco
 
@@ -261,7 +262,7 @@ class Interface:
 			jid = gajim.get_jid_from_account(account)
 			if not self.instances[account]['infos'].has_key('vcard'):
 				self.instances[account]['infos'][jid] = \
-					dialogs.VcardWindow(jid, account, True)
+					vcard.VcardWindow(jid, account, True)
 				gajim.connections[account].request_vcard(jid)
 		if self.remote and self.remote.is_enabled():
 			self.remote.raise_signal('AccountPresence', (status, account))
diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index 488cbd1b0..3c094a406 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -26,6 +26,7 @@ import time
 import os
 
 import dialogs
+import vcard
 import chat
 import cell_renderer_image
 import gtkgui_helpers
@@ -1111,7 +1112,7 @@ current room topic.') % command, room_jid)
 				show = c.show, status = c.status, sub = c.sub, 
 				resource = c.resource, role = c.role, affiliation = c.affiliation)
 			gajim.interface.instances[self.account]['infos'][jid] = \
-				dialogs.VcardWindow(c2, self.account, False)
+				vcard.VcardWindow(c2, self.account, False)
 
 	def on_history(self, widget, room_jid, nick):
 		c = gajim.gc_contacts[self.account][room_jid][nick]
diff --git a/src/roster_window.py b/src/roster_window.py
index 473a71df9..8087216eb 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -30,6 +30,7 @@ import tabbed_chat_window
 import groupchat_window
 import history_window
 import dialogs
+import vcard
 import config
 import disco
 import gtkgui_helpers
@@ -680,7 +681,7 @@ class RosterWindow:
 		if info.has_key(user.jid):
 			info[user.jid].window.present()
 		else:
-			info[user.jid] = dialogs.VcardWindow(user, account)
+			info[user.jid] = vcard.VcardWindow(user, account)
 
 	def show_tooltip(self, contact):
 		pointer = self.tree.get_pointer()
diff --git a/src/vcard.py b/src/vcard.py
index 062d74e97..c00e8fcb2 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -25,8 +25,8 @@ import base64
 import mimetypes
 import os
 import sys
-import dialogs
 import gtkgui_helpers
+import dialogs
 
 from common import helpers
 from common import gajim