Commits March 2017

commits@gajim.org

1 participants
31 discussions

[Git][gajim/gajim][master] 2 commits: Do not close chat window on ESC key when roster filtering is active
by Philipp Hörist 25 Mar '17

25 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8e990f8 by Markus Böhme at 2017-03-25T14:24:30+01:00 Do not close chat window on ESC key when roster filtering is active When the roster window active it can be filtered by starting to type. If the window behavior "single window for everything" is selected, trying to abort the filtering by pressing the ESC key also closes a chat window. Fix this behavior by stopping event propagation in case the ESC key is pressed while roster filtering is active. Fixes issue #8548. - - - - - fbb19c5c by Philipp Hörist at 2017-03-25T17:23:51+01:00 Merge branch 'issue-8548-master' into 'master' Fix issue #8548 on master: Do not close chat window on ESC key when roster filtering is active Closes #8548 See merge request !74 - - - - - 1 changed file: - src/roster_window.py Changes: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -3805,7 +3805,7 @@ class RosterWindow: if event.keyval == Gdk.KEY_Escape: if self.rfilter_enabled: self.disable_rfilter() - return + return True if gajim.interface.msg_win_mgr.mode == \ MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER and \ gajim.interface.msg_win_mgr.one_window_opened(): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ba0408855c3538d053fcace1d3f6cc17c…

1 0

[Git][gajim/gajim][gajim_0.16] 2 commits: Do not close chat window on ESC key when roster filtering is active
by Philipp Hörist 25 Mar '17

25 Mar '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: b31e1b6a by Markus Böhme at 2017-03-25T14:31:48+01:00 Do not close chat window on ESC key when roster filtering is active When the roster window active it can be filtered by starting to type. If the window behavior "single window for everything" is selected, trying to abort the filtering by pressing the ESC key also closes a chat window. Fix this behavior by stopping event propagation in case the ESC key is pressed while roster filtering is active. Fixes issue #8548. - - - - - 051234f2 by Philipp Hörist at 2017-03-25T17:22:55+01:00 Merge branch 'issue-8548-gajim_0.16' into 'gajim_0.16' Fix issue #8548 on gajim_0.16: Do not close chat window on ESC key when roster filtering is active See merge request !73 - - - - - 1 changed file: - src/roster_window.py Changes: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -4059,7 +4059,7 @@ class RosterWindow: if event.keyval == gtk.keysyms.Escape: if self.rfilter_enabled: self.disable_rfilter() - return + return True if gajim.interface.msg_win_mgr.mode == \ MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER and \ gajim.interface.msg_win_mgr.one_window_opened(): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bdb22b9aea83123edde9c3a849f863c90…

1 0

[Git][gajim/gajim][master] Fix regression from ad9370af
by Philipp Hörist 24 Mar '17

24 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ba040885 by Philipp Hörist at 2017-03-24T23:35:08+01:00 Fix regression from ad9370af - - - - - 1 changed file: - src/common/jingle_content.py Changes: ===================================== src/common/jingle_content.py ===================================== --- a/src/common/jingle_content.py +++ b/src/common/jingle_content.py @@ -202,7 +202,7 @@ class JingleContent: # if the file is less than 10 mb, then it is small # lets calculate it right away if self.file_props.size < 10000000 and not self.file_props.hash_: - hash_data = content._compute_hash() + hash_data = self._compute_hash() if hash_data: file_tag.addChild(node=hash_data) pjid = gajim.get_jid_without_resource(self.session.peerjid) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ba0408855c3538d053fcace1d3f6cc17c4…

1 0

[Git][gajim/gajim][master] 9 commits: Dont block contacts only partially
by Philipp Hörist 14 Mar '17

14 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5377fc82 by Philipp Hörist at 2017-03-14T22:29:50+01:00 Dont block contacts only partially This is needed for better interop with XEP-0191. The Server doesnt deliver a partial blocked contact as blocked to a XEP-0191 Client. - - - - - 18e29ebc by Philipp Hörist at 2017-03-14T22:30:16+01:00 Add blocked contacts always to the default list - - - - - 63335357 by Philipp Hörist at 2017-03-14T22:30:52+01:00 Use push event to query privacy list after edit - - - - - 25b933e2 by Philipp Hörist at 2017-03-14T22:31:07+01:00 Dont try to set empty privacy default list This will result in a conflict stanza because an active default list cant be deleted Decline the use of default list first, then delete the list - - - - - 9f5c13b5 by Philipp Hörist at 2017-03-14T22:31:23+01:00 Dont set default list active on block There could be another list active (eg. invisible) If we block someone while invisible, setting the default list active would make us visible again - - - - - 2c23b36a by Philipp Hörist at 2017-03-14T22:31:43+01:00 Remove redundant method - - - - - a0a036f3 by Philipp Hörist at 2017-03-14T22:32:05+01:00 Decline active list when going visible Declining the active list will switch us to the default list - - - - - 1e33af70 by Philipp Hörist at 2017-03-14T22:32:28+01:00 Fix KeyError when privacy list is received - - - - - 49a5bb63 by Philipp Hörist at 2017-03-14T22:39:42+01:00 Merge branch 'master' into 'master' Fix Privacy Lists Closes #8476 See merge request !68 - - - - - 3 changed files: - src/common/connection.py - src/common/connection_handlers.py - src/groupchat_control.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -1733,16 +1733,6 @@ class Connection(CommonConnection, ConnectionHandlers): iq = self.build_invisible_rule() self.connection.send(iq) - def activate_privacy_rule(self, name): - """ - Activate a privacy rule - """ - if not gajim.account_is_connected(self.name): - return - iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, xmlns='') - iq.setQuery().setTag('active', {'name': name}) - self.connection.send(iq) - def get_max_blocked_list_order(self): max_order = 0 for rule in self.blocked_list: @@ -1752,6 +1742,8 @@ class Connection(CommonConnection, ConnectionHandlers): return max_order def block_contacts(self, contact_list, message): + if self.privacy_default_list is None: + self.privacy_default_list = 'block' if not self.privacy_rules_supported: if self.blocking_supported: #XEP-0191 iq = nbxmpp.Iq('set', xmlns='') @@ -1764,16 +1756,15 @@ class Connection(CommonConnection, ConnectionHandlers): for contact in contact_list: self.send_custom_status('offline', message, contact.jid) max_order = self.get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), 'type': 'jid', 'action': 'deny', - 'value' : contact.jid, 'child': ['message', 'iq', - 'presence-out']} + new_rule = {'order': str(max_order + 1), + 'type': 'jid', + 'action': 'deny', + 'value': contact.jid} self.blocked_list.append(new_rule) self.blocked_contacts.append(contact.jid) - self.set_privacy_list('block', self.blocked_list) + self.set_privacy_list(self.privacy_default_list, self.blocked_list) if len(self.blocked_list) == 1: - self.set_active_list('block') - self.set_default_list('block') - self.get_privacy_list('block') + self.set_default_list(self.privacy_default_list) def unblock_contacts(self, contact_list): if not self.privacy_rules_supported: @@ -1795,15 +1786,14 @@ class Connection(CommonConnection, ConnectionHandlers): if rule['action'] != 'deny' or rule['type'] != 'jid' \ or rule['value'] not in self.to_unblock: self.new_blocked_list.append(rule) - self.set_privacy_list('block', self.new_blocked_list) - self.get_privacy_list('block') if len(self.new_blocked_list) == 0: self.blocked_list = [] self.blocked_contacts = [] self.blocked_groups = [] self.set_default_list('') - self.set_active_list('') - self.del_privacy_list('block') + self.del_privacy_list(self.privacy_default_list) + else: + self.set_privacy_list(self.privacy_default_list, self.new_blocked_list) if not gajim.interface.roster.regroup: show = gajim.SHOW_LIST[self.connected] else: # accounts merged @@ -1820,14 +1810,14 @@ class Connection(CommonConnection, ConnectionHandlers): for contact in contact_list: self.send_custom_status('offline', message, contact.jid) max_order = self.get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), 'type': 'group', 'action': 'deny', - 'value' : group, 'child': ['message', 'iq', 'presence-out']} + new_rule = {'order': str(max_order + 1), + 'type': 'group', + 'action': 'deny', + 'value': group} self.blocked_list.append(new_rule) - self.set_privacy_list('block', self.blocked_list) + self.set_privacy_list(self.privacy_default_list, self.blocked_list) if len(self.blocked_list) == 1: - self.set_active_list('block') - self.set_default_list('block') - self.get_privacy_list('block') + self.set_default_list(self.privacy_default_list) def unblock_group(self, group, contact_list): if not self.privacy_rules_supported: @@ -1839,15 +1829,14 @@ class Connection(CommonConnection, ConnectionHandlers): if rule['action'] != 'deny' or rule['type'] != 'group' or \ rule['value'] != group: self.new_blocked_list.append(rule) - self.set_privacy_list('block', self.new_blocked_list) - self.get_privacy_list('block') if len(self.new_blocked_list) == 0: self.blocked_list = [] self.blocked_contacts = [] self.blocked_groups = [] self.set_default_list('') - self.set_active_list('') - self.del_privacy_list('block') + self.del_privacy_list(self.privacy_default_list) + else: + self.set_privacy_list(self.privacy_default_list, self.new_blocked_list) if not gajim.interface.roster.regroup: show = gajim.SHOW_LIST[self.connected] else: # accounts merged @@ -1888,7 +1877,7 @@ class Connection(CommonConnection, ConnectionHandlers): if iq_obj.getType() == 'error': # server doesn't support privacy lists return # active the privacy rule - self.activate_privacy_rule('invisible') + self.set_active_list('invisible') self.connected = gajim.SHOW_LIST.index('invisible') self.status = msg priority = gajim.get_priority(self.name, 'invisible') @@ -2123,12 +2112,7 @@ class Connection(CommonConnection, ConnectionHandlers): def _change_from_invisible(self): if self.privacy_rules_supported: - if self.blocked_list: - self.activate_privacy_rule('block') - else: - iq = self.build_privacy_rule('visible', 'allow') - self.connection.send(iq) - self.activate_privacy_rule('visible') + self.set_active_list('') def _update_status(self, show, msg): xmpp_show = helpers.get_xmpp_show(show) @@ -2446,9 +2430,10 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection.send(iq) def _nec_privacy_list_received(self, obj): + roster = gajim.interface.roster if obj.conn.name != self.name: return - if obj.list_name != 'block': + if obj.list_name != self.privacy_default_list: return self.blocked_contacts = [] self.blocked_groups = [] @@ -2475,6 +2460,12 @@ class Connection(CommonConnection, ConnectionHandlers): self.blocked_groups.append(rule['value']) self.blocked_list.append(rule) + if 'type' in rule: + if rule['type'] == 'jid': + roster.draw_contact(rule['value'], self.name) + if rule['type'] == 'group': + roster.draw_group(rule['value'], self.name) + def _request_bookmarks_xml(self): if not gajim.account_is_connected(self.name): return ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -568,7 +568,11 @@ class ConnectionVcard: elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: del self.awaiting_answers[id_] if iq_obj.getType() != 'error': - self.get_privacy_list('block') + for list_ in iq_obj.getQueryPayload(): + if list_.getName() == 'default': + self.privacy_default_list = list_.getAttr('name') + self.get_privacy_list(self.privacy_default_list) + break # Ask metacontacts before roster self.get_metacontacts() else: @@ -1443,6 +1447,8 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self.awaiting_xmpp_ping_id = None self.continue_connect_info = None + self.privacy_default_list = None + try: self.sleeper = common.sleepy.Sleepy() HAS_IDLE = True @@ -2055,6 +2061,11 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): if q: result.delChild(q) self.connection.send(result) + + for list_ in iq_obj.getQueryPayload(): + if list_.getName() == 'list': + self.get_privacy_list(list_.getAttr('name')) + raise nbxmpp.NodeProcessed def _getRoster(self): ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -2769,6 +2769,7 @@ class GroupchatControl(ChatControlBase): def on_block(self, widget, nick): fjid = self.room_jid + '/' + nick connection = gajim.connections[self.account] + default = connection.privacy_default_list if fjid in connection.blocked_contacts: return max_order = connection.get_max_blocked_list_order() @@ -2778,15 +2779,14 @@ class GroupchatControl(ChatControlBase): connection.blocked_list.append(new_rule) connection.blocked_contacts.append(fjid) self.draw_contact(nick) - connection.set_privacy_list('block', connection.blocked_list) + connection.set_privacy_list(default, connection.blocked_list) if len(connection.blocked_list) == 1: - connection.set_active_list('block') - connection.set_default_list('block') - connection.get_privacy_list('block') + connection.set_default_list(default) def on_unblock(self, widget, nick): fjid = self.room_jid + '/' + nick connection = gajim.connections[self.account] + default = connection.privacy_default_list connection.new_blocked_list = [] # needed for draw_contact: if fjid in connection.blocked_contacts: @@ -2797,18 +2797,17 @@ class GroupchatControl(ChatControlBase): or rule['value'] != fjid: connection.new_blocked_list.append(rule) - connection.set_privacy_list('block', connection.new_blocked_list) - connection.get_privacy_list('block') if len(connection.new_blocked_list) == 0: connection.blocked_list = [] connection.blocked_contacts = [] connection.blocked_groups = [] connection.set_default_list('') - connection.set_active_list('') - connection.del_privacy_list('block') + connection.del_privacy_list(default) if 'privay_list_block' in gajim.interface.instances[self.account]: del gajim.interface.instances[self.account]\ ['privay_list_block'] + else: + connection.set_privacy_list(default, connection.new_blocked_list) def on_voice_checkmenuitem_activate(self, widget, nick): if widget.get_active(): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4966b4bf069045966b18321ed77de1cdf…

1 0

[Git][gajim/gajim][master] 2 commits: Dont notify on own sent carbon copies
by Philipp Hörist 14 Mar '17

14 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 142f2214 by Philipp Hörist at 2017-03-14T22:17:16+01:00 Dont notify on own sent carbon copies - - - - - 4966b4bf by Philipp Hörist at 2017-03-14T22:17:48+01:00 Remove notifications on receiving own sent carbon copies Notifications for a JID are removed when we see activity in the form of a sent carbon copie from one of our other devices. If we receive such carbon copies we can conclude that the message we received earlier was answered from one of our other devices. - - - - - 1 changed file: - src/session.py Changes: ===================================== src/session.py ===================================== --- a/src/session.py +++ b/src/session.py @@ -244,16 +244,21 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): event_type = 'single_message_received' if self.control and obj.mtype != 'normal': + # We have a ChatControl open obj.show_in_roster = False obj.show_in_systray = False + elif obj.forwarded and obj.sent: + # Its a Carbon Copied Message we sent + obj.show_in_roster = False + obj.show_in_systray = False + gajim.events.remove_events(self.conn.name, fjid, types=['chat']) else: + # Everything else obj.show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact, self) obj.show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) - if (not self.control and obj.mtype != 'normal') or \ - (obj.mtype == 'normal' and not obj.popup): event = event_t(obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, obj.msg_log_id, correct_id=(obj.id_, obj.correct_id), xhtml=obj.xhtml, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/69022ab100dc65839c1d9f1e920fe1cdb…

1 0

[Git][gajim/gajim][gajim_0.16] 3 commits: Dont notify on own sent carbon copies
by Philipp Hörist 14 Mar '17

14 Mar '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 88314abf by Philipp Hörist at 2017-03-14T20:12:49+01:00 Dont notify on own sent carbon copies - - - - - e1575344 by Philipp Hörist at 2017-03-14T20:27:36+01:00 Remove notifications on receiving own sent carbon copies Notifications for a JID are removed when we see activity in the form of a sent carbon copie from one of our other devices. If we receive such carbon copies we can conclude that the message we received earlier was answered from one of our other devices. - - - - - bdb22b9a by Philipp Hörist at 2017-03-14T20:32:03+01:00 Merge branch 'gajim_0.16' into 'gajim_0.16' Notification improvements See merge request !67 - - - - - 1 changed file: - src/session.py Changes: ===================================== src/session.py ===================================== --- a/src/session.py +++ b/src/session.py @@ -244,16 +244,21 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): event_type = 'single_message_received' if self.control and obj.mtype != 'normal': + # We have a ChatControl open obj.show_in_roster = False obj.show_in_systray = False + elif obj.forwarded and obj.sent: + # Its a Carbon Copied Message we sent + obj.show_in_roster = False + obj.show_in_systray = False + gajim.events.remove_events(self.conn.name, fjid, types=['chat']) else: + # Everything else obj.show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact, self) obj.show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) - if (not self.control and obj.mtype != 'normal') or \ - (obj.mtype == 'normal' and not obj.popup): event = event_t(obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, obj.msg_log_id, correct_id=(obj.id_, obj.correct_id), xhtml=obj.xhtml, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d603a30f3a06319d5eecfb983615b50b6…

1 0

[Git][gajim/gajim][gajim_0.16] Fix return value and negativ timeout values
by Philipp Hörist 13 Mar '17

13 Mar '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: d603a30f by Philipp Hörist at 2017-03-14T00:03:56+01:00 Fix return value and negativ timeout values Fixes #8533 - - - - - 1 changed file: - src/common/logger.py Changes: ===================================== src/common/logger.py ===================================== --- a/src/common/logger.py +++ b/src/common/logger.py @@ -598,11 +598,11 @@ class Logger: # How many lines to restore and when to time them out restore_how_many = gajim.config.get('restore_lines') if restore_how_many <= 0: - return + return [] timeout = gajim.config.get('restore_timeout') # in minutes now = int(float(time.time())) - if timeout != 0: + if timeout > 0: timeout = now - (timeout * 60) # before that they are too old # so if we ask last 5 lines and we have 2 pending we get # 3 - 8 (we avoid the last 2 lines but we still return 5 asked) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d603a30f3a06319d5eecfb983615b50b6e…

1 0

[Git][gajim/gajim][gajim_0.16] Dont treat MAM results as unread messages
by Philipp Hörist 13 Mar '17

13 Mar '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 09542bd0 by Philipp Hörist at 2017-03-13T23:28:55+01:00 Dont treat MAM results as unread messages Fixes #8544 - - - - - 1 changed file: - src/common/logger.py Changes: ===================================== src/common/logger.py ===================================== --- a/src/common/logger.py +++ b/src/common/logger.py @@ -495,7 +495,8 @@ class Logger: all_messages.append(results[0] + (shown,)) return all_messages - def write(self, kind, jid, message=None, show=None, tim=None, subject=None): + def write(self, kind, jid, message=None, show=None, tim=None, subject=None, + mam_query=False): """ Write a row (status, gcstatus, message etc) to logs database @@ -568,7 +569,7 @@ class Logger: except exceptions.PysqliteOperationalError, e: raise exceptions.PysqliteOperationalError(str(e)) if kind == 'chat_msg_recv': - if not self.jid_is_from_pm(jid): + if not self.jid_is_from_pm(jid) and not mam_query: # Save in unread table only if it's not a pm write_unread = True @@ -1148,7 +1149,7 @@ class Logger: log.debug('Log already in DB, ignoring it') return log.debug('New log received from server archives, storing it') - self.write(type_, with_, message=msg, tim=tim) + self.write(type_, with_, message=msg, tim=tim, mam_query=True) def _nec_gc_message_received(self, obj): tim_f = float(time.mktime(obj.timestamp)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/09542bd0b017926bd5f9c7dae92617c34e…

1 0

[Git][gajim/gajim][master] Dont treat MAM results as unread messages
by Philipp Hörist 13 Mar '17

13 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 69022ab1 by Philipp Hörist at 2017-03-13T23:21:33+01:00 Dont treat MAM results as unread messages Fixes #8544 - - - - - 1 changed file: - src/common/logger.py Changes: ===================================== src/common/logger.py ===================================== --- a/src/common/logger.py +++ b/src/common/logger.py @@ -490,7 +490,8 @@ class Logger: all_messages.append(results[0]) return all_messages - def write(self, kind, jid, message=None, show=None, tim=None, subject=None, additional_data=None): + def write(self, kind, jid, message=None, show=None, tim=None, subject=None, + additional_data=None, mam_query=False): """ Write a row (status, gcstatus, message etc) to logs database @@ -566,7 +567,7 @@ class Logger: except exceptions.PysqliteOperationalError as e: raise exceptions.PysqliteOperationalError(str(e)) if kind == 'chat_msg_recv': - if not self.jid_is_from_pm(jid): + if not self.jid_is_from_pm(jid) and not mam_query: # Save in unread table only if it's not a pm write_unread = True @@ -1143,7 +1144,8 @@ class Logger: log.debug('Log already in DB, ignoring it') return log.debug('New log received from server archives, storing it') - self.write(type_, with_, message=msg, tim=tim, additional_data=additional_data) + self.write(type_, with_, message=msg, tim=tim, + additional_data=additional_data, mam_query=True) def _nec_gc_message_received(self, obj): tim_f = float(obj.timestamp) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/69022ab100dc65839c1d9f1e920fe1cdb2…

1 0

[Git][gajim/gajim][master] 2 commits: Add new Columns to Logs.db
by Philipp Hörist 13 Mar '17

13 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c75c45bc by Philipp Hörist at 2017-03-13T19:33:16+01:00 Add new Columns to Logs.db - - - - - d874676e by Philipp Hörist at 2017-03-13T21:18:28+01:00 Merge branch 'sql' into 'master' Add new Columns to Logs.db See merge request !66 - - - - - 3 changed files: - src/common/check_paths.py - src/common/defs.py - src/common/optparser.py Changes: ===================================== src/common/check_paths.py ===================================== --- a/src/common/check_paths.py +++ b/src/common/check_paths.py @@ -72,7 +72,12 @@ def create_log_db(): show INTEGER, message TEXT, subject TEXT, - additional_data TEXT DEFAULT '{}' + additional_data TEXT DEFAULT '{}', + stanza_id TEXT, + mam_id TEXT, + encryption TEXT, + encryption_state TEXT, + marker INTEGER ); CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); ===================================== src/common/defs.py ===================================== --- a/src/common/defs.py +++ b/src/common/defs.py @@ -30,7 +30,7 @@ import os.path docdir = '../' basedir = '../' localedir = '../po' -version = '0.16.10.2' +version = '0.16.10.3' try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, ===================================== src/common/optparser.py ===================================== --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -234,6 +234,8 @@ class OptionsParser: self.update_config_to_016101() if old < [0, 16, 10, 2] and new >= [0, 16, 10, 2]: self.update_config_to_016102() + if old < [0, 16, 10, 3] and new >= [0, 16, 10, 3]: + self.update_config_to_016103() gajim.logger.init_vars() gajim.logger.attach_cache_database() @@ -975,3 +977,25 @@ class OptionsParser: con.close() gajim.config.set('version', '0.16.10.2') + + def update_config_to_016103(self): + back = os.getcwd() + os.chdir(logger.LOG_DB_FOLDER) + con = sqlite.connect(logger.LOG_DB_FILE) + os.chdir(back) + cur = con.cursor() + try: + cur.executescript( + ''' + ALTER TABLE logs ADD COLUMN 'stanza_id' TEXT; + ALTER TABLE logs ADD COLUMN 'mam_id' TEXT; + ALTER TABLE logs ADD COLUMN 'encryption' TEXT; + ALTER TABLE logs ADD COLUMN 'encryption_state' TEXT; + ALTER TABLE logs ADD COLUMN 'marker' INTEGER; + ''' + ) + con.commit() + except sqlite.OperationalError: + pass + con.close() + gajim.config.set('version', '0.16.10.3') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/55561b3dd0df0cb8e49aa6be32d7846ba…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2017