Philipp Hörist pushed to branch master at gajim / gajim
Commits:
74be6b5e by Philipp Hörist at 2023-10-29T11:07:53+01:00
change: Avatar: Don’t use custom avatar for IRC group chats
- - - - -
079f4a62 by Philipp Hörist at 2023-10-29T11:07:53+01:00
imprv: StartChat: Better discover MUC services
- - - - -
2 changed files:
- gajim/gtk/avatar.py
- gajim/gtk/start_chat.py
Changes:
=====================================
gajim/gtk/avatar.py
=====================================
@@ -470,13 +470,6 @@ def get_muc_surface(self,
transport_icon: str | None = None,
style: str = 'circle') -> cairo.ImageSurface:
- if transport_icon == 'gateway-irc':
- surface = load_icon_surface('gajim-agent-irc', size, scale)
- assert surface is not None
- surface = add_transport_to_avatar(surface, transport_icon)
- self._cache[jid][(size, scale, None, transport_icon)] = surface
- return surface
-
if not default:
surface = self._cache[jid].get((size, scale, None, transport_icon))
if surface is not None:
=====================================
gajim/gtk/start_chat.py
=====================================
@@ -416,7 +416,10 @@ def _disco_info_received(self, task: Task) -> None:
self._show_error_page(_('This address is not reachable.'))
return
- if result.is_muc:
+ if result.is_muc and not result.jid.is_domain:
+ # This is mostly a fix for the MUC protocol, there is no
+ # way to differentiate between a MUC service and room.
+ # Except the MUC XEP defines rooms should have a localpart.
row.update_chat_type(groupchat=True)
else:
row.update_chat_type()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/26e018ffe5c9e0f8b29a5d8700772aaede99d505...079f4a629abc000936dd22fa0d6c030696b6dcde
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/26e018ffe5c9e0f8b29a5d8700772aaede99d505...079f4a629abc000936dd22fa0d6c030696b6dcde
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
