Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
-
6acdae9a
by wurstsalat at 2021-12-07T09:06:17+01:00
-
f5902fd9
by wurstsalat at 2021-12-07T09:10:31+01:00
-
8e81ec9b
by wurstsalat at 2021-12-07T09:22:22+01:00
3 changed files:
Changes:
| ... | ... | @@ -459,7 +459,7 @@ def get_conversation_around(self, account, jid, timestamp): |
| 459 | 459 |
account_id=account_id)
|
| 460 | 460 |
sql_at_after = '''
|
| 461 | 461 |
SELECT contact_name, time, kind, show, message, subject,
|
| 462 |
- additional_data, log_line_id, message_id,
|
|
| 462 |
+ additional_data, log_line_id, message_id, stanza_id,
|
|
| 463 | 463 |
error as "error [common_error]",
|
| 464 | 464 |
marker as "marker [marker]"
|
| 465 | 465 |
FROM logs NATURAL JOIN jids WHERE jid IN ({jids})
|
| ... | ... | @@ -497,7 +497,7 @@ def get_conversation_between(self, account, jid, before, after): |
| 497 | 497 |
|
| 498 | 498 |
sql = '''
|
| 499 | 499 |
SELECT contact_name, time, kind, show, message, subject,
|
| 500 |
- additional_data, log_line_id, message_id,
|
|
| 500 |
+ additional_data, log_line_id, message_id, stanza_id,
|
|
| 501 | 501 |
error as "error [common_error]",
|
| 502 | 502 |
marker as "marker [marker]"
|
| 503 | 503 |
FROM logs NATURAL JOIN jids WHERE jid IN ({jids})
|
| ... | ... | @@ -864,8 +864,7 @@ def __init__(self, account): |
| 864 | 864 |
settings = [
|
| 865 | 865 |
Setting(SettingKind.SWITCH, _('Contact Information'),
|
| 866 | 866 |
SettingType.ACCOUNT_CONFIG, 'request_user_data',
|
| 867 |
- desc=_('Request contact information '
|
|
| 868 |
- '(Mood, Activity, Tune, Location)')),
|
|
| 867 |
+ desc=_('Request contact information (Tune, Location)')),
|
|
| 869 | 868 |
|
| 870 | 869 |
Setting(SettingKind.SWITCH, _('Accept all Contact Requests'),
|
| 871 | 870 |
SettingType.ACCOUNT_CONFIG, 'autoauth',
|
| ... | ... | @@ -83,6 +83,7 @@ function install_deps { |
| 83 | 83 |
mingw-w64-"${ARCH}"-gst-plugins-base \
|
| 84 | 84 |
mingw-w64-"${ARCH}"-gst-libav \
|
| 85 | 85 |
mingw-w64-"${ARCH}"-gst-python \
|
| 86 |
+ mingw-w64-"${ARCH}"-farstream \
|
|
| 86 | 87 |
mingw-w64-"${ARCH}"-python-pip \
|
| 87 | 88 |
mingw-w64-"${ARCH}"-adwaita-icon-theme \
|
| 88 | 89 |
mingw-w64-"${ARCH}"-libwebp \
|