Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim] Pushed new tag gajim-1.0.0-alpha2
by Yann Leboulanger 17 Dec '17

17 Dec '17

Yann Leboulanger pushed new tag gajim-1.0.0-alpha2 at gajim / gajim --- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim-1.0.0-alpha2 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update ChangeLog
by Philipp Hörist 17 Dec '17

17 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8f2630b1 by Philipp Hörist at 2017-12-17T21:28:07+01:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Gajim 0.98.2 (17 December 2017) + + * Fix DB migration + Gajim 0.98.1 (15 December 2017) * Ported to GTK3 / Python3 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8f2630b10f18edf0741ad6bf3267bcc376… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8f2630b10f18edf0741ad6bf3267bcc376… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] add transient_for parameter
by Yann Leboulanger 17 Dec '17

17 Dec '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: ec2da20f by Yann Leboulanger at 2017-12-17T18:41:49+01:00 add transient_for parameter - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2828,7 +2828,7 @@ class RosterWindow: sectext = _('You will no longer be able to send and receive ' 'messages to contacts from these transports: %s') % jids dialogs.ConfirmationDialog(pritext, sectext, - on_response_ok = (remove, list_)) + on_response_ok = (remove, list_), transient_for=self.window) def _nec_blocking(self, obj): if obj.unblock_all or obj.blocklist: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ec2da20f5816bd555abe205463d75bc8c5… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ec2da20f5816bd555abe205463d75bc8c5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove incorrect assert
by Philipp Hörist 17 Dec '17

17 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b8fe0e20 by Apromixately at 2017-12-16T16:23:44+01:00 Remove incorrect assert When a ping reply is received there is probably a connection. Anyway, the last ping might have been lost and the ids might not match up. - - - - - 0959bd44 by Philipp Hörist at 2017-12-17T18:01:44+01:00 Merge branch 'master' into 'master' Remove incorrect assert See merge request gajim/gajim!171 - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1523,8 +1523,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection.send(' ') def _on_xmpp_ping_answer(self, iq_obj): - id_ = iq_obj.getAttr('id') - assert id_ == self.awaiting_xmpp_ping_id self.awaiting_xmpp_ping_id = None def sendPing(self, pingTo=None, control=None): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1b11d77034c1c47c134c80ca9b497c76e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1b11d77034c1c47c134c80ca9b497c76e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MAM: Dont convert own_jid to string
by Philipp Hörist 17 Dec '17

17 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1b11d770 by Philipp Hörist at 2017-12-17T17:56:11+01:00 MAM: Dont convert own_jid to string We need it later as JID object - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1062,7 +1062,7 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): def generate(self): archive_jid = self.stanza.getFrom() - own_jid = self.conn.get_own_jid().getStripped() + own_jid = self.conn.get_own_jid() if archive_jid and not archive_jid.bareMatch(own_jid): # MAM Message not from our Archive return False @@ -1076,7 +1076,8 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.unique_id, origin_id = self.get_unique_id() # Check for duplicates - if app.logger.find_stanza_id(own_jid, self.unique_id, origin_id): + if app.logger.find_stanza_id(own_jid.getStripped(), + self.unique_id, origin_id): return self.msgtxt = self.msg_.getTagData('body') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1b11d77034c1c47c134c80ca9b497c76e1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1b11d77034c1c47c134c80ca9b497c76e1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix undefined var
by Philipp Hörist 17 Dec '17

17 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 65593c61 by Philipp Hörist at 2017-12-17T17:34:22+01:00 Fix undefined var - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -263,7 +263,7 @@ class Interface: if account in self.show_vcard_when_connect and obj.show not in ( 'offline', 'error'): self.edit_own_details(account) - self.show_vcard_when_connect.remove(self.name) + self.show_vcard_when_connect.remove(account) def edit_own_details(self, account): jid = app.get_jid_from_account(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/65593c613c6ef5664e20641ada0be10157… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/65593c613c6ef5664e20641ada0be10157… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix DB migration for additional_data
by Philipp Hörist 17 Dec '17

17 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9411ccd8 by Philipp Hörist at 2017-12-17T17:10:00+01:00 Fix DB migration for additional_data - - - - - 2 changed files: - gajim/common/check_paths.py - gajim/common/optparser.py Changes: ===================================== gajim/common/check_paths.py ===================================== --- a/gajim/common/check_paths.py +++ b/gajim/common/check_paths.py @@ -73,7 +73,7 @@ def create_log_db(): show INTEGER, message TEXT, subject TEXT, - additional_data TEXT DEFAULT '{}', + additional_data TEXT, stanza_id TEXT, encryption TEXT, encryption_state TEXT, ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -871,7 +871,7 @@ class OptionsParser: self.call_sql(logger.LOG_DB_PATH, '''ALTER TABLE logs - ADD COLUMN 'additinal_data' TEXT default '()';''' + ADD COLUMN 'additional_data' TEXT;''' ) app.config.set('version', '0.16.10.2') @@ -920,6 +920,7 @@ class OptionsParser: self.call_sql(logger.LOG_DB_PATH, ''' ALTER TABLE logs ADD COLUMN 'account_id' INTEGER; + ALTER TABLE logs ADD COLUMN 'additional_data' TEXT; ''' ) app.config.set('version', '0.98.2') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9411ccd827df809275c0318b40b989f473… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9411ccd827df809275c0318b40b989f473… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make sure our own JID is in the DB
by Philipp Hörist 17 Dec '17

17 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c4c6106 by Philipp Hörist at 2017-12-17T13:48:32+01:00 Make sure our own JID is in the DB - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1109,6 +1109,9 @@ class Interface: """ # ('SIGNED_IN', account, ()) # block signed in notifications for 30 seconds + + # Add our own JID into the DB + app.logger.insert_jid(obj.conn.get_own_jid().getStripped()) account = obj.conn.name app.block_signed_in_notifications[account] = True state = self.sleeper.getState() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c4c610632111be1fc6d88583478e7aded… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c4c610632111be1fc6d88583478e7aded… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Add correct DB migration
by Philipp Hörist 17 Dec '17

17 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 020d4754 by Philipp Hörist at 2017-12-17T11:55:38+01:00 Add correct DB migration Fixes #8806 - - - - - 2001cf4a by Philipp Hörist at 2017-12-17T11:56:04+01:00 Update version to 0.98.2 - - - - - dfafedc2 by Philipp Hörist at 2017-12-17T12:00:15+01:00 Remove unused DB fields This field was added but never used This does not remove the columns from the DB, but doesnt add them in new migrations. - - - - - 3 changed files: - gajim/__init__.py - gajim/common/check_paths.py - gajim/common/optparser.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,6 +1,6 @@ import subprocess -__version__ = "0.98.1" +__version__ = "0.98.2" try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, ===================================== gajim/common/check_paths.py ===================================== --- a/gajim/common/check_paths.py +++ b/gajim/common/check_paths.py @@ -75,7 +75,6 @@ def create_log_db(): subject TEXT, additional_data TEXT DEFAULT '{}', stanza_id TEXT, - mam_id TEXT, encryption TEXT, encryption_state TEXT, marker INTEGER ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -247,6 +247,8 @@ class OptionsParser: self.update_config_to_016111() if old < [0, 16, 11, 2] and new >= [0, 16, 11, 2]: self.update_config_to_016112() + if old < [0, 98, 2] and new >= [0, 98, 2]: + self.update_config_to_0982() app.logger.init_vars() app.logger.attach_cache_database() @@ -876,7 +878,6 @@ class OptionsParser: def update_config_to_016103(self): self.call_sql(logger.LOG_DB_PATH, '''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; @@ -913,3 +914,12 @@ class OptionsParser: ''' ) app.config.set('version', '0.16.11.2') + + def update_config_to_0982(self): + # This fixes a typo in update_config_to_016112() + self.call_sql(logger.LOG_DB_PATH, + ''' + ALTER TABLE logs ADD COLUMN 'account_id' INTEGER; + ''' + ) + app.config.set('version', '0.98.2') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/410aee7ba0c51d5bfb4d9f965ac4e87b3… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/410aee7ba0c51d5bfb4d9f965ac4e87b3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix typo in DB migration
by Philipp Hörist 17 Dec '17

17 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 410aee7b by Philipp Hörist at 2017-12-17T11:34:54+01:00 Fix typo in DB migration - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -909,7 +909,7 @@ class OptionsParser: oldest_mam_timestamp TEXT, last_muc_timestamp TEXT ); - ALTER TABLE logs ADD COLUMN 'account_jid' INTEGER; + ALTER TABLE logs ADD COLUMN 'account_id' INTEGER; ''' ) app.config.set('version', '0.16.11.2') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/410aee7ba0c51d5bfb4d9f965ac4e87b36… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/410aee7ba0c51d5bfb4d9f965ac4e87b36… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits