try to prevent circular imports
This commit is contained in:
parent
6487b8463c
commit
1921c43a94
|
@ -27,6 +27,7 @@ import common.sleepy
|
||||||
|
|
||||||
import gtkgui_helpers
|
import gtkgui_helpers
|
||||||
import dialogs
|
import dialogs
|
||||||
|
import vcard
|
||||||
import cell_renderer_image
|
import cell_renderer_image
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -1375,7 +1376,7 @@ _('Without a connection, you can not edit your personal information.')
|
||||||
gajim.interface.instances[self.account]['infos'][jid].window.present()
|
gajim.interface.instances[self.account]['infos'][jid].window.present()
|
||||||
else:
|
else:
|
||||||
gajim.interface.instances[self.account]['infos'][jid] = \
|
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)
|
gajim.connections[self.account].request_vcard(jid)
|
||||||
|
|
||||||
def on_manage_proxies_button_clicked(self, widget):
|
def on_manage_proxies_button_clicked(self, widget):
|
||||||
|
|
|
@ -24,8 +24,8 @@ import gobject
|
||||||
import os
|
import os
|
||||||
|
|
||||||
import gtkgui_helpers
|
import gtkgui_helpers
|
||||||
|
import vcard
|
||||||
|
|
||||||
from vcard import VcardWindow
|
|
||||||
from filetransfers_window import FileTransfersWindow
|
from filetransfers_window import FileTransfersWindow
|
||||||
from gajim_themes_window import GajimThemesWindow
|
from gajim_themes_window import GajimThemesWindow
|
||||||
from advanced import AdvancedConfigurationWindow
|
from advanced import AdvancedConfigurationWindow
|
||||||
|
@ -613,7 +613,7 @@ class SubscriptionRequestWindow:
|
||||||
gajim.interface.instances[self.account]['infos'][self.jid].window.present()
|
gajim.interface.instances[self.account]['infos'][self.jid].window.present()
|
||||||
else:
|
else:
|
||||||
gajim.interface.instances[self.account]['infos'][self.jid] = \
|
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
|
#remove the publish / retrieve buttons
|
||||||
vcard_xml = gajim.interface.instances[self.account]['infos'][self.jid].xml
|
vcard_xml = gajim.interface.instances[self.account]['infos'][self.jid].xml
|
||||||
hbuttonbox = vcard_xml.get_widget('information_hbuttonbox')
|
hbuttonbox = vcard_xml.get_widget('information_hbuttonbox')
|
||||||
|
|
|
@ -155,6 +155,7 @@ class Contact:
|
||||||
import roster_window
|
import roster_window
|
||||||
import systray
|
import systray
|
||||||
import dialogs
|
import dialogs
|
||||||
|
import vcard
|
||||||
import config
|
import config
|
||||||
import disco
|
import disco
|
||||||
|
|
||||||
|
@ -261,7 +262,7 @@ class Interface:
|
||||||
jid = gajim.get_jid_from_account(account)
|
jid = gajim.get_jid_from_account(account)
|
||||||
if not self.instances[account]['infos'].has_key('vcard'):
|
if not self.instances[account]['infos'].has_key('vcard'):
|
||||||
self.instances[account]['infos'][jid] = \
|
self.instances[account]['infos'][jid] = \
|
||||||
dialogs.VcardWindow(jid, account, True)
|
vcard.VcardWindow(jid, account, True)
|
||||||
gajim.connections[account].request_vcard(jid)
|
gajim.connections[account].request_vcard(jid)
|
||||||
if self.remote and self.remote.is_enabled():
|
if self.remote and self.remote.is_enabled():
|
||||||
self.remote.raise_signal('AccountPresence', (status, account))
|
self.remote.raise_signal('AccountPresence', (status, account))
|
||||||
|
|
|
@ -26,6 +26,7 @@ import time
|
||||||
import os
|
import os
|
||||||
|
|
||||||
import dialogs
|
import dialogs
|
||||||
|
import vcard
|
||||||
import chat
|
import chat
|
||||||
import cell_renderer_image
|
import cell_renderer_image
|
||||||
import gtkgui_helpers
|
import gtkgui_helpers
|
||||||
|
@ -1111,7 +1112,7 @@ current room topic.') % command, room_jid)
|
||||||
show = c.show, status = c.status, sub = c.sub,
|
show = c.show, status = c.status, sub = c.sub,
|
||||||
resource = c.resource, role = c.role, affiliation = c.affiliation)
|
resource = c.resource, role = c.role, affiliation = c.affiliation)
|
||||||
gajim.interface.instances[self.account]['infos'][jid] = \
|
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):
|
def on_history(self, widget, room_jid, nick):
|
||||||
c = gajim.gc_contacts[self.account][room_jid][nick]
|
c = gajim.gc_contacts[self.account][room_jid][nick]
|
||||||
|
|
|
@ -30,6 +30,7 @@ import tabbed_chat_window
|
||||||
import groupchat_window
|
import groupchat_window
|
||||||
import history_window
|
import history_window
|
||||||
import dialogs
|
import dialogs
|
||||||
|
import vcard
|
||||||
import config
|
import config
|
||||||
import disco
|
import disco
|
||||||
import gtkgui_helpers
|
import gtkgui_helpers
|
||||||
|
@ -680,7 +681,7 @@ class RosterWindow:
|
||||||
if info.has_key(user.jid):
|
if info.has_key(user.jid):
|
||||||
info[user.jid].window.present()
|
info[user.jid].window.present()
|
||||||
else:
|
else:
|
||||||
info[user.jid] = dialogs.VcardWindow(user, account)
|
info[user.jid] = vcard.VcardWindow(user, account)
|
||||||
|
|
||||||
def show_tooltip(self, contact):
|
def show_tooltip(self, contact):
|
||||||
pointer = self.tree.get_pointer()
|
pointer = self.tree.get_pointer()
|
||||||
|
|
|
@ -25,8 +25,8 @@ import base64
|
||||||
import mimetypes
|
import mimetypes
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import dialogs
|
|
||||||
import gtkgui_helpers
|
import gtkgui_helpers
|
||||||
|
import dialogs
|
||||||
|
|
||||||
from common import helpers
|
from common import helpers
|
||||||
from common import gajim
|
from common import gajim
|
||||||
|
|
Loading…
Reference in New Issue