Philipp Hörist pushed to branch pref-new at gajim / gajim
Commits:
def9b48d by Philipp Hörist at 2025-08-29T19:45:08+02:00
fixes
- - - - -
3 changed files:
- gajim/common/client.py
- gajim/gtk/preference/account.py
- gajim/gtk/settings.py
Changes:
=====================================
gajim/common/client.py
=====================================
@@ -372,7 +372,7 @@ def is_own_jid(self, jid: JID | str) -> bool:
def get_own_contact(self) -> BareContact:
jid = self.get_own_jid()
- contact = self.get_module("Contacts").get_contact(jid)
+ contact = self.get_module("Contacts").get_contact(jid.bare)
assert isinstance(contact, BareContact)
return contact
=====================================
gajim/gtk/preference/account.py
=====================================
@@ -19,6 +19,7 @@
from gajim.common.events import AccountEnabled
from gajim.common.ged import EventHelper
from gajim.common.i18n import _
+from gajim.common.i18n import p_
from gajim.gtk.alert import AlertDialog
from gajim.gtk.alert import CancelDialogResponse
@@ -821,9 +822,14 @@ def __init__(self, account: str) -> None:
self._account = account
active = app.settings.get_account_setting(account, "active")
+
+ self._label = Gtk.Label(margin_end=12)
+ self.add_suffix(self._label)
+
self._switch = Gtk.Switch(active=active, valign=Gtk.Align.CENTER)
self.add_suffix(self._switch)
self.set_activatable_widget(self._switch)
+ self._update_label()
self.register_events(
[
@@ -840,6 +846,12 @@ def do_unroot(self) -> None:
self.unregister_events()
app.check_finalize(self)
+ def _update_label(self) -> None:
+ if self._switch.get_active():
+ self._label.set_text(p_("Switch", "On"))
+ else:
+ self._label.set_text(p_("Switch", "Off"))
+
def _on_account_state_changed(
self, event: AccountEnabled | AccountDisabled
) -> None:
@@ -847,9 +859,8 @@ def _on_account_state_changed(
return
state = isinstance(event, AccountEnabled)
- if self._switch.get_state() == state:
- return
self._switch.set_state(state)
+ self._update_label()
def _on_state_changed(
self, client: types.Client, _signal_name: str, client_state:
ClientState
=====================================
gajim/gtk/settings.py
=====================================
@@ -64,6 +64,7 @@ def __init__(
self.account = account
if flags == Gtk.DialogFlags.MODAL:
self.window.set_modal(True)
+
elif flags == Gtk.DialogFlags.DESTROY_WITH_PARENT:
self.window.set_destroy_with_parent(True)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/def9b48dd0f5aac1a3fb0212a6947ec4102a70bc
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/def9b48dd0f5aac1a3fb0212a6947ec4102a70bc
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]
