Philipp Hörist pushed to branch master at gajim / gajim
Commits:
28df08b7 by Philipp Hörist at 2022-10-26T21:30:06+02:00
fix: MUC: Allow changing subject if there is none
Fixes #11250
- - - - -
2 changed files:
- gajim/common/modules/muc.py
- gajim/gtk/groupchat_manage.py
Changes:
=====================================
gajim/common/modules/muc.py
=====================================
@@ -810,20 +810,20 @@ def _on_subject_change(self,
old_subject = muc_data.subject
muc_subject = properties.muc_subject
+ assert muc_subject is not None
muc_data.subject = muc_subject
- if muc_subject is not None:
- if muc_subject.timestamp is None:
- muc_subject = muc_subject._replace(timestamp=time.time())
+ if muc_subject.timestamp is None:
+ muc_subject = muc_subject._replace(timestamp=time.time())
- if old_subject is None:
- muc_data.last_subject_timestamp = time.time()
- room.notify('room-subject', muc_subject)
- else:
- # Check if we already showed that subject (rejoin)
- if old_subject.text != muc_subject.text:
- muc_data.last_subject_timestamp = time.time()
- room.notify('room-subject', muc_subject)
+ if old_subject is None:
+ muc_data.last_subject_timestamp = time.time()
+ room.notify('room-subject', muc_subject)
+
+ elif old_subject.text != muc_subject.text:
+ # Check if we already showed that subject (rejoin)
+ muc_data.last_subject_timestamp = time.time()
+ room.notify('room-subject', muc_subject)
if muc_data.state == MUCJoinedState.JOINING:
self._room_join_complete(muc_data)
=====================================
gajim/gtk/groupchat_manage.py
=====================================
@@ -120,13 +120,15 @@ def _on_subject_change_clicked(self, _button: Gtk.Button)
-> None:
def _on_room_subject(self,
_contact: GroupchatContact,
_signal_name: str,
- subject: Optional[MucSubject]
+ subject: MucSubject
) -> None:
- if subject is None:
- return
self._ui.subject_textview.get_buffer().set_text(subject.text)
+ assert self._contact.subject is not None
+ self._ui.subject_change_button.set_sensitive(
+ subject.text != self._contact.subject.text)
+
def _prepare_manage(self) -> None:
joined = self._contact.is_joined
vcard_support = False
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/28df08b723a74e087e5bb424bdd19e225d78e9d7
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/28df08b723a74e087e5bb424bdd19e225d78e9d7
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
