Prevention of cyclical imports. Fixes #6845
This commit is contained in:
parent
362e8764d8
commit
5679d4314b
|
@ -38,7 +38,6 @@ import vcard
|
||||||
import conversation_textview
|
import conversation_textview
|
||||||
import message_control
|
import message_control
|
||||||
import dataforms_widget
|
import dataforms_widget
|
||||||
import disco
|
|
||||||
|
|
||||||
from random import randrange
|
from random import randrange
|
||||||
from common import pep
|
from common import pep
|
||||||
|
@ -2388,6 +2387,7 @@ class JoinGroupchatWindow:
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
# Object will add itself to the window dict
|
# Object will add itself to the window dict
|
||||||
|
import disco
|
||||||
disco.ServiceDiscoveryWindow(self.account, server,
|
disco.ServiceDiscoveryWindow(self.account, server,
|
||||||
initial_identities=[{'category': 'conference',
|
initial_identities=[{'category': 'conference',
|
||||||
'type': 'text'}])
|
'type': 'text'}])
|
||||||
|
|
Loading…
Reference in New Issue