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

request message archiving only if server supports it.

This commit is contained in:
Yann Leboulanger 2010-08-11 20:12:11 +02:00
parent ca43e5441c
commit 9282678d8c
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/connection.py
View File

@ -153,6 +153,7 @@ class CommonConnection:
self.privacy_rules_supported = False self.privacy_rules_supported = False
self.vcard_supported = False self.vcard_supported = False
self.private_storage_supported = False self.private_storage_supported = False
self.archiving_supported = False
self.archive_pref_supported = False self.archive_pref_supported = False
self.muc_jid = {} # jid of muc server for each transport type self.muc_jid = {} # jid of muc server for each transport type

2
src/common/connection_handlers.py
View File

@ -368,6 +368,8 @@ class ConnectionDisco:
our_jid = gajim.get_jid_from_account(self.name) our_jid = gajim.get_jid_from_account(self.name)
self.send_pb_purge(our_jid, 'storage:bookmarks') self.send_pb_purge(our_jid, 'storage:bookmarks')
self.send_pb_delete(our_jid, 'storage:bookmarks') self.send_pb_delete(our_jid, 'storage:bookmarks')
if features.__contains__(common.xmpp.NS_ARCHIVE):
self.archiving_supported = True
if features.__contains__(common.xmpp.NS_ARCHIVE_AUTO): if features.__contains__(common.xmpp.NS_ARCHIVE_AUTO):
self.archive_auto_supported = True self.archive_auto_supported = True
if features.__contains__(common.xmpp.NS_ARCHIVE_MANAGE): if features.__contains__(common.xmpp.NS_ARCHIVE_MANAGE):

11
src/gui_interface.py
View File

@ -1573,11 +1573,12 @@ class Interface:
if gajim.connections[account].pep_supported and dbus_support.supported \ if gajim.connections[account].pep_supported and dbus_support.supported \
and gajim.config.get_per('accounts', account, 'publish_location'): and gajim.config.get_per('accounts', account, 'publish_location'):
location_listener.enable() location_listener.enable()
# Start merging logs from server if gajim.connections[account].archiving_supported:
gajim.connections[account].request_modifications_page( # Start merging logs from server
gajim.config.get_per('accounts', account, 'last_archiving_time')) gajim.connections[account].request_modifications_page(
gajim.config.set_per('accounts', account, 'last_archiving_time', gajim.config.get_per('accounts', account, 'last_archiving_time'))
time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())) gajim.config.set_per('accounts', account, 'last_archiving_time',
time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()))
def handle_event_metacontacts(self, account, tags_list): def handle_event_metacontacts(self, account, tags_list):
gajim.contacts.define_metacontacts(account, tags_list) gajim.contacts.define_metacontacts(account, tags_list)