Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
d8a7b278 by wurstsalat at 2022-06-11T17:03:00+02:00
chore: Add type annotation for emoji_data
- - - - -
e6393492 by wurstsalat at 2022-06-11T17:46:48+02:00
imprv: Gateways: Use avatar if published
- - - - -
2 changed files:
- gajim/common/modules/contacts.py
- gajim/gtk/emoji_data.pyi
Changes:
=====================================
gajim/common/modules/contacts.py
=====================================
@@ -361,7 +361,6 @@ def get_avatar(self,
transport_icon = None
if self.is_gateway:
- show = None
disco_info = app.storage.cache.get_last_disco_info(self._jid)
if disco_info is not None:
if disco_info.gateway_type == 'sms':
@@ -374,6 +373,9 @@ def get_avatar(self,
transport_icon = 'gajim-agent-sms'
break
+ if self.avatar_sha is not None:
+ transport_icon = None
+
if pixbuf:
return app.app.avatar_storage.get_pixbuf(
self,
=====================================
gajim/gtk/emoji_data.pyi
=====================================
@@ -22,6 +22,7 @@ class Emoji(IntEnum):
...
def is_emoji(codepoints: str) -> bool: ...
+def get_emoji_font() -> str: ...
def get_emoji_pixbuf(codepoints: str) -> GdkPixbuf.Pixbuf: ...
class EmojiData(OrderedDict):
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/901014263230f6a8042922fab65a94c150cede48...e639349285bb5e1f6f5282a61521d8a12f40a3ef
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/901014263230f6a8042922fab65a94c150cede48...e639349285bb5e1f6f5282a61521d8a12f40a3ef
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
