changeset 3bd6009e8e5a in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=3bd6009e8e5a
description: Fix some mino things about archiving preference window. see #5792
diffstat:
src/common/connection_handlers.py | 1 +
src/common/message_archiving.py | 2 ++
src/common/stanza_session.py | 3 ++-
src/dialogs.py | 5 +----
src/message_control.py | 6 +++---
5 files changed, 9 insertions(+), 8 deletions(-)
diffs (81 lines):
diff -r 9c17bf82e36a -r 3bd6009e8e5a src/common/connection_handlers.py
--- a/src/common/connection_handlers.py Tue May 25 16:33:40 2010 +0200
+++ b/src/common/connection_handlers.py Sun Jun 27 21:50:00 2010 +0200
@@ -701,6 +701,7 @@
elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTIONS_ARRIVED:
# TODO
+ print 'ARCHIVING_COLLECTIONS_ARRIVED'
pass
elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTION_ARRIVED:
diff -r 9c17bf82e36a -r 3bd6009e8e5a src/common/message_archiving.py
--- a/src/common/message_archiving.py Tue May 25 16:33:40 2010 +0200
+++ b/src/common/message_archiving.py Sun Jun 27 21:50:00 2010 +0200
@@ -184,6 +184,8 @@
self.dispatch('ARCHIVING_CHANGED', ('itemremove',
item.getAttr('jid')))
+ raise common.xmpp.NodeProcessed
+
def request_collections_list_page(self, with_='', start=None, end=None,
after=None, max=30, exact_match=False):
iq_ = common.xmpp.Iq('get')
diff -r 9c17bf82e36a -r 3bd6009e8e5a src/common/stanza_session.py
--- a/src/common/stanza_session.py Tue May 25 16:33:40 2010 +0200
+++ b/src/common/stanza_session.py Sun Jun 27 21:50:00 2010 +0200
@@ -315,7 +315,8 @@
"""
def __init__(self, conn, jid, thread_id, type_='chat'):
- StanzaSession.__init__(self, conn, jid, thread_id, type_='chat')
+ ArchivingStanzaSession.__init__(self, conn, jid, thread_id,
+ type_='chat')
self.xes = {}
self.es = {}
diff -r 9c17bf82e36a -r 3bd6009e8e5a src/dialogs.py
--- a/src/dialogs.py Tue May 25 16:33:40 2010 +0200
+++ b/src/dialogs.py Sun Jun 27 21:50:00 2010 +0200
@@ -3394,7 +3394,6 @@
self.item_config = gajim.connections[self.account].items[self.item]
else:
self.item_config = gajim.connections[self.account].default
- print self.item, self.item_config
self.waiting = None
# Connect to gtk builder
@@ -3620,7 +3619,6 @@
def on_edit_item_button_clicked(self, widget):
if not self.current_item:
- print 'there is no current item'
return
key_name = 'edit_item_archiving_preferences_%s' % self.current_item
@@ -3726,8 +3724,7 @@
print error
def on_close_button_clicked(self, widget):
- if not self.waiting:
- self.window.destroy()
+ self.window.destroy()
def on_archiving_preferences_window_destroy(self, widget):
if 'archiving_preferences' in gajim.interface.instances[self.account]:
diff -r 9c17bf82e36a -r 3bd6009e8e5a src/message_control.py
--- a/src/message_control.py Tue May 25 16:33:40 2010 +0200
+++ b/src/message_control.py Sun Jun 27 21:50:00 2010 +0200
@@ -207,9 +207,9 @@
EncryptedStanzaSession) and oldsession.enable_encryption)
archiving_changed = bool(session and isinstance(session,
- ArchivingStanzaSession) and session.archiving) != \
- bool(oldsession and isinstance(oldsession,
- ArchivingStanzaSession) and oldsession.archiving)
+ ArchivingStanzaSession) and session.archiving) != \
+ bool(oldsession and isinstance(oldsession,
+ ArchivingStanzaSession) and oldsession.archiving)
if crypto_changed or archiving_changed:
self.print_session_details()
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
