Philipp Hörist pushed to branch master at gajim / gajim
Commits:
09512065 by Philipp Hörist at 2017-04-18T18:26:06+02:00
Fix wrong inclusion check
- - - - -
d7a6b6ab by Philipp Hörist at 2017-04-18T18:56:57+02:00
Register new MAM Events
- - - - -
86e29fb7 by Philipp Hörist at 2017-04-18T18:58:06+02:00
LegacyArchiving Event does not have a type
- - - - -
3 changed files:
- src/common/connection.py
- src/common/connection_handlers.py
- src/common/connection_handlers_events.py
Changes:
=====================================
src/common/connection.py
=====================================
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -2009,14 +2009,13 @@ class Connection(CommonConnection, ConnectionHandlers):
# Remove stored bookmarks accessible to everyone.
self.send_pb_purge(our_jid, 'storage:bookmarks')
self.send_pb_delete(our_jid, 'storage:bookmarks')
- if (nbxmpp.NS_MAM or nbxmpp.NS_MAM_1 or nbxmpp.NS_MAM_2) \
- in obj.features:
- if nbxmpp.NS_MAM_2 in obj.features:
- self.archiving_namespace = nbxmpp.NS_MAM_2
- elif nbxmpp.NS_MAM_1 in obj.features:
- self.archiving_namespace = nbxmpp.NS_MAM_1
- else:
- self.archiving_namespace = nbxmpp.NS_MAM
+ if nbxmpp.NS_MAM_2 in obj.features:
+ self.archiving_namespace = nbxmpp.NS_MAM_2
+ elif nbxmpp.NS_MAM_1 in obj.features:
+ self.archiving_namespace = nbxmpp.NS_MAM_1
+ elif nbxmpp.NS_MAM in obj.features:
+ self.archiving_namespace = nbxmpp.NS_MAM
+ if self.archiving_namespace:
self.archiving_supported = True
self.archiving_313_supported = True
get_action(self.name + '-archive').set_enabled(True)
=====================================
src/common/connection_handlers.py
=====================================
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1451,6 +1451,10 @@ ConnectionHandlersBase, ConnectionJingle,
ConnectionIBBytestream):
ArchivingPreferencesChangedReceivedEvent)
gajim.nec.register_incoming_event(
Archiving313PreferencesChangedReceivedEvent)
+ gajim.nec.register_incoming_event(
+ ArchivingFinishedLegacyReceivedEvent)
+ gajim.nec.register_incoming_event(
+ ArchivingFinishedReceivedEvent)
gajim.nec.register_incoming_event(NotificationEvent)
gajim.ged.register_event_handler('http-auth-received', ged.CORE,
=====================================
src/common/connection_handlers_events.py
=====================================
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -1836,7 +1836,6 @@ class
ArchivingFinishedLegacyReceivedEvent(nec.NetworkIncomingEvent):
def generate(self):
self.conn = self.base_event.conn
self.stanza = self.base_event.stanza
- self.type_ = self.base_event.type_
self.fin = self.stanza.getTag('fin', namespace=nbxmpp.NS_MAM)
if not self.fin:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/b42c21d3e049cda4f9bb596c470dc3f0006cfa43...86e29fb7f460a9a93fe5af8981b041122df2e7b9
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
