Philipp Hörist pushed to branch master at gajim / gajim
Commits:
ab6c80fe by Philipp Hörist at 2023-03-12T12:48:03+01:00
other: Update release issue template
- - - - -
1 changed file:
- .gitlab/issue_templates/Release.md
Changes:
=====================================
.gitlab/issue_templates/Release.md
=====================================
@@ -3,6 +3,7 @@
## Build
* [ ] Merge translations from Weblate
* [ ] Update IANA data with `./scripts/get_iana_data.py gajim/common/iana.py`
+* [ ] Run `./scripts/update_flatpak_manifest.py`
* [ ] Run `./scripts/bump_version.py x.x.x`
* [ ] Push release tag `x.x.x`
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab6c80fe87d8c662a4ee39df06ae19bf…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab6c80fe87d8c662a4ee39df06ae19bf…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
44cbd2ff by Philipp Hörist at 2023-03-11T19:55:05+01:00
fix: Migration: Don’t fail on color setting migration
Fixes #11426
- - - - -
1 changed file:
- gajim/common/optparser.py
Changes:
=====================================
gajim/common/optparser.py
=====================================
@@ -219,7 +219,7 @@ def update_config_to_1195(self):
account_string = '%s@%s' % (username, domain)
# We cannot get the preferred theme at this point
background = (1, 1, 1)
- col_r, col_g, col_b = text_to_color(account_string, background)
+ col_r, col_g, col_b = text_to_color(account_string, 100, 40)
rgba = Gdk.RGBA(red=col_r, green=col_g, blue=col_b)
color = rgba.to_string()
app.config.set_per('accounts', account, 'account_color', color)
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/44cbd2ffa469f9f3c2ba0b51fc4aa5c4…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/44cbd2ffa469f9f3c2ba0b51fc4aa5c4…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
bc14c535 by wurstsalat at 2023-03-09T18:59:28+00:00
fix: Don't fail if contact name for MUC message is None
Fixes #11417
- - - - -
2 changed files:
- gajim/common/storage/archive.py
- gajim/gtk/control.py
Changes:
=====================================
gajim/common/storage/archive.py
=====================================
@@ -100,7 +100,7 @@ class JidsTableRow(NamedTuple):
class ConversationRow(NamedTuple):
- contact_name: str
+ contact_name: str | None
time: float
kind: int
show: int
=====================================
gajim/gtk/control.py
=====================================
@@ -730,6 +730,10 @@ def add_messages(self, messages: list[ConversationRow]):
contact_name = self.contact.name
elif msg.kind == KindConstant.GC_MSG:
kind = 'incoming'
+ if contact_name is None:
+ # Fall back to MUC name if contact name is None
+ # (may be the case for service messages from the MUC)
+ contact_name = self.contact.name
elif msg.kind in (
KindConstant.SINGLE_MSG_SENT, KindConstant.CHAT_MSG_SENT):
kind = 'outgoing'
@@ -738,6 +742,8 @@ def add_messages(self, messages: list[ConversationRow]):
log.warning('kind attribute could not be processed'
'while adding message')
+ assert contact_name is not None
+
if msg.additional_data is not None:
retracted_by = msg.additional_data.get_value('retracted', 'by')
if retracted_by is not None:
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc14c535134510e0bd382314188b0b9c…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc14c535134510e0bd382314188b0b9c…
You're receiving this email because of your account on dev.gajim.org.