Philipp Hörist pushed to branch master at gajim / gajim
Commits:
d896101a by Philipp Hörist at 2023-05-22T20:47:54+00:00
cfix: Revert: Update avatar on muc-disco-update
- - - - -
4 changed files:
- gajim/gtk/chat_banner.py
- gajim/gtk/chat_list_row.py
- gajim/gtk/groupchat_details.py
- gajim/gtk/groupchat_manage.py
Changes:
=====================================
gajim/gtk/chat_banner.py
=====================================
@@ -221,7 +221,6 @@ def _on_muc_disco_update(self, event: MucDiscoUpdate) ->
None:
if event.jid != self._contact.jid:
return
- self._update_avatar()
self._update_name_label()
self._update_description_label()
=====================================
gajim/gtk/chat_list_row.py
=====================================
@@ -30,11 +30,9 @@
from nbxmpp import JID
from gajim.common import app
-from gajim.common import ged
from gajim.common.const import AvatarSize
from gajim.common.const import KindConstant
from gajim.common.const import RowHeaderType
-from gajim.common.events import MucDiscoUpdate
from gajim.common.helpers import AdditionalDataDict
from gajim.common.helpers import get_group_chat_nick
from gajim.common.helpers import get_groupchat_name
@@ -135,8 +133,6 @@ def __init__(self,
self.connect('drag-data-get', self._on_drag_data_get)
if self.type == 'groupchat':
- app.ged.register_event_handler(
- 'muc-disco-update', ged.GUI1, self._on_muc_disco_update)
self._ui.group_chat_indicator.show()
self.update_avatar()
@@ -433,21 +429,12 @@ def _on_state_flags_changed(self,
else:
self._ui.revealer.set_reveal_child(False)
- def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None:
- if event.jid != self.contact.jid:
- return
-
- self.update_avatar()
-
def _on_destroy(self, _row: ChatListRow) -> None:
app.settings.disconnect_signals(self)
self.contact.disconnect_all_from_obj(self)
if isinstance(self.contact, GroupchatParticipant):
self.contact.room.disconnect_all_from_obj(self)
- app.ged.remove_event_handler('muc-disco-update',
- ged.GUI1,
- self._on_muc_disco_update)
app.check_finalize(self)
def _on_close_button_clicked(self, _button: Gtk.Button) -> None:
=====================================
gajim/gtk/groupchat_details.py
=====================================
@@ -114,8 +114,6 @@ def _on_client_state_changed(self,
def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None:
if event.jid != self._contact.jid:
return
-
- self._load_avatar()
self._ui.name_entry.set_text(self._contact.name)
disco_info = self._contact.get_disco()
assert disco_info is not None
=====================================
gajim/gtk/groupchat_manage.py
=====================================
@@ -25,9 +25,7 @@
from nbxmpp.task import Task
from gajim.common import app
-from gajim.common import ged
from gajim.common.const import AvatarSize
-from gajim.common.events import MucDiscoUpdate
from gajim.common.helpers import validate_jid
from gajim.common.i18n import _
from gajim.common.modules.contacts import GroupchatContact
@@ -51,9 +49,6 @@ def __init__(self,
self._contact = contact
self._contact.connect('room-subject', self._on_room_subject)
- app.ged.register_event_handler(
- 'muc-disco-update', ged.GUI1, self._on_muc_disco_update)
-
self._room_config_form = None
self._ui = get_builder('groupchat_manage.ui')
@@ -75,21 +70,12 @@ def __init__(self,
def _on_destroy(self, *args: Any) -> None:
del self._avatar_selector
- app.ged.remove_event_handler('muc-disco-update',
- ged.GUI1,
- self._on_muc_disco_update)
app.check_finalize(self)
@property
def disco_info(self):
return app.storage.cache.get_last_disco_info(self._contact.jid)
- def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None:
- if event.jid != self._contact.jid:
- return
-
- self.update_avatar()
-
def _prepare_subject(self) -> None:
text = ''
if self._contact.subject is not None:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/d896101a22793dcaaeff4c3f3801bb7f0682c31e
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/d896101a22793dcaaeff4c3f3801bb7f0682c31e
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
