changeset 394443510fae in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=394443510fae
description: merge
diffstat:
src/dialogs.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (19 lines):
diff -r 98d2ca592d6d -r 394443510fae src/dialogs.py
--- a/src/dialogs.py Sat Mar 26 22:35:13 2011 +0100
+++ b/src/dialogs.py Sat Mar 26 22:37:08 2011 +0100
@@ -38,7 +38,6 @@
import conversation_textview
import message_control
import dataforms_widget
-import disco
from random import randrange
from common import pep
@@ -2388,6 +2387,7 @@
else:
try:
# Object will add itself to the window dict
+ import disco
disco.ServiceDiscoveryWindow(self.account, server,
initial_identities=[{'category': 'conference',
'type': 'text'}])
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
