copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix some mino things about archiving preference window. see #5792

Browse source
This commit is contained in:
Yann Leboulanger 2010-06-27 21:50:00 +02:00
parent 2c2e4201d7
commit 60d9b234a7
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/connection_handlers.py
View file

@ -701,6 +701,7 @@ class ConnectionVcard:
elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTIONS_ARRIVED: elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTIONS_ARRIVED:
# TODO # TODO
print 'ARCHIVING_COLLECTIONS_ARRIVED'
pass pass
elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTION_ARRIVED: elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTION_ARRIVED:

2
src/common/message_archiving.py
View file

@ -184,6 +184,8 @@ class ConnectionArchive:
self.dispatch('ARCHIVING_CHANGED', ('itemremove', self.dispatch('ARCHIVING_CHANGED', ('itemremove',
item.getAttr('jid'))) item.getAttr('jid')))
raise common.xmpp.NodeProcessed
def request_collections_list_page(self, with_='', start=None, end=None, def request_collections_list_page(self, with_='', start=None, end=None,
after=None, max=30, exact_match=False): after=None, max=30, exact_match=False):
iq_ = common.xmpp.Iq('get') iq_ = common.xmpp.Iq('get')

3
src/common/stanza_session.py
View file

@ -315,7 +315,8 @@ class EncryptedStanzaSession(ArchivingStanzaSession):
""" """
def __init__(self, conn, jid, thread_id, type_='chat'): 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.xes = {}
self.es = {} self.es = {}

5
src/dialogs.py
View file

@ -3394,7 +3394,6 @@ class ItemArchivingPreferencesWindow:
self.item_config = gajim.connections[self.account].items[self.item] self.item_config = gajim.connections[self.account].items[self.item]
else: else:
self.item_config = gajim.connections[self.account].default self.item_config = gajim.connections[self.account].default
print self.item, self.item_config
self.waiting = None self.waiting = None
# Connect to gtk builder # Connect to gtk builder
@ -3620,7 +3619,6 @@ class ArchivingPreferencesWindow:
def on_edit_item_button_clicked(self, widget): def on_edit_item_button_clicked(self, widget):
if not self.current_item: if not self.current_item:
print 'there is no current item'
return return
key_name = 'edit_item_archiving_preferences_%s' % self.current_item key_name = 'edit_item_archiving_preferences_%s' % self.current_item
@ -3726,8 +3724,7 @@ class ArchivingPreferencesWindow:
print error print error
def on_close_button_clicked(self, widget): 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): def on_archiving_preferences_window_destroy(self, widget):
if 'archiving_preferences' in gajim.interface.instances[self.account]: if 'archiving_preferences' in gajim.interface.instances[self.account]:

6
src/message_control.py
View file

@ -207,9 +207,9 @@ class MessageControl:
EncryptedStanzaSession) and oldsession.enable_encryption) EncryptedStanzaSession) and oldsession.enable_encryption)
archiving_changed = bool(session and isinstance(session, archiving_changed = bool(session and isinstance(session,
ArchivingStanzaSession) and session.archiving) != \ ArchivingStanzaSession) and session.archiving) != \
bool(oldsession and isinstance(oldsession, bool(oldsession and isinstance(oldsession,
ArchivingStanzaSession) and oldsession.archiving) ArchivingStanzaSession) and oldsession.archiving)
if crypto_changed or archiving_changed: if crypto_changed or archiving_changed:
self.print_session_details() self.print_session_details()