Philipp Hörist pushed to branch master at gajim / gajim
Commits:
65e90543 by Philipp Hörist at 2025-04-13T15:17:37+02:00
fix: StartChat: Consider show value "chat" the same as "online"
- - - - -
3 changed files:
- gajim/common/util/status.py
- gajim/gtk/groupchat_roster.py
- gajim/gtk/start_chat.py
Changes:
=====================================
gajim/common/util/status.py
=====================================
@@ -13,7 +13,7 @@
from gajim.common.const import SHOW_STRING_MNEMONIC
ShowSortOrder = {
- PresenceShow.CHAT: 0,
+ PresenceShow.CHAT: 1,
PresenceShow.ONLINE: 1,
PresenceShow.DND: 2,
PresenceShow.AWAY: 3,
=====================================
gajim/gtk/groupchat_roster.py
=====================================
@@ -381,8 +381,9 @@ def _sort_func(
return -1 if obj1.contact.is_self else 1
if app.settings.get("sort_by_show_in_muc"):
- if obj1.contact.show != obj2.contact.show:
- return compare_show(obj1.contact.show, obj2.contact.show)
+ res = compare_show(obj1.contact.show, obj2.contact.show)
+ if res != 0:
+ return res
return locale.strcoll(obj1.nick.lower(), obj2.nick.lower())
=====================================
gajim/gtk/start_chat.py
=====================================
@@ -963,8 +963,9 @@ def _sort_func(
return 1 if obj1.is_self else -1
if app.settings.get("sort_by_show_in_start_chat"):
- if obj1.show != obj2.show:
- return compare_show(obj1.show, obj2.show)
+ res = compare_show(obj1.show, obj2.show)
+ if res != 0:
+ return res
return locale.strcoll(obj1.name.lower(), obj2.name.lower())
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/65e90543a85b3545f95f0ac55c9d145e762a1b40
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/65e90543a85b3545f95f0ac55c9d145e762a1b40
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]
