Daniel Brötzmann pushed to branch master at gajim / gajim

Commits: 6acdae9a by wurstsalat at 2021-12-07T09:06:17+01:00 Windows build: Add farstream

- - - - - f5902fd9 by wurstsalat at 2021-12-07T09:10:31+01:00 Archive query: Add missing stanza_id

Fixes #10710

- - - - - 8e81ec9b by wurstsalat at 2021-12-07T09:22:22+01:00 Accounts: Remove reference to mood and activity

- - - - -

3 changed files:

- gajim/common/storage/archive.py - gajim/gtk/accounts.py - win/_base.sh

Changes:

===================================== gajim/common/storage/archive.py ===================================== @@ -459,7 +459,7 @@ def get_conversation_around(self, account, jid, timestamp): account_id=account_id) sql_at_after = ''' SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id, message_id, + additional_data, log_line_id, message_id, stanza_id, error as "error [common_error]", marker as "marker [marker]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) @@ -497,7 +497,7 @@ def get_conversation_between(self, account, jid, before, after):

sql = ''' SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id, message_id, + additional_data, log_line_id, message_id, stanza_id, error as "error [common_error]", marker as "marker [marker]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids})

===================================== gajim/gtk/accounts.py ===================================== @@ -864,8 +864,7 @@ def __init__(self, account): settings = [ Setting(SettingKind.SWITCH, _('Contact Information'), SettingType.ACCOUNT_CONFIG, 'request_user_data', - desc=_('Request contact information ' - '(Mood, Activity, Tune, Location)')), + desc=_('Request contact information (Tune, Location)')),

Setting(SettingKind.SWITCH, _('Accept all Contact Requests'), SettingType.ACCOUNT_CONFIG, 'autoauth',

===================================== win/_base.sh ===================================== @@ -83,6 +83,7 @@ function install_deps { mingw-w64-"${ARCH}"-gst-plugins-base \ mingw-w64-"${ARCH}"-gst-libav \ mingw-w64-"${ARCH}"-gst-python \ + mingw-w64-"${ARCH}"-farstream \ mingw-w64-"${ARCH}"-python-pip \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ mingw-w64-"${ARCH}"-libwebp \

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1d6d6d4723db50ceb04f0ae8a250e70c...