Philipp Hörist pushed to branch mainwindow at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/chat_control_base.py
    ... ... @@ -34,7 +34,6 @@
    34 34
     from gi.repository import GLib
    
    35 35
     from gi.repository import Gio
    
    36 36
     
    
    37
    -from gajim.common import events
    
    38 37
     from gajim.common import app
    
    39 38
     from gajim.common import helpers
    
    40 39
     from gajim.common import ged
    
    ... ... @@ -42,7 +41,6 @@
    42 41
     from gajim.common.i18n import _
    
    43 42
     from gajim.common.nec import EventHelper
    
    44 43
     from gajim.common.helpers import AdditionalDataDict
    
    45
    -from gajim.common.helpers import event_filter
    
    46 44
     from gajim.common.contacts import GC_Contact
    
    47 45
     from gajim.common.const import Chatstate
    
    48 46
     from gajim.common.structs import OutgoingMessage
    
    ... ... @@ -56,8 +54,6 @@
    56 54
     from gajim.gui.dialogs import PastePreviewDialog
    
    57 55
     from gajim.gui.message_input import MessageInputTextView
    
    58 56
     from gajim.gui.util import at_the_end
    
    59
    -from gajim.gui.util import get_show_in_roster
    
    60
    -from gajim.gui.util import get_show_in_systray
    
    61 57
     from gajim.gui.util import get_hardware_key_codes
    
    62 58
     from gajim.gui.util import get_builder
    
    63 59
     from gajim.gui.util import generate_account_badge
    

  • gajim/groupchat_control.py
    ... ... @@ -1173,7 +1173,6 @@ def _on_muc_nickname_changed(self, event):
    1173 1173
             self.roster.remove_contact(nick)
    
    1174 1174
             self.roster.add_contact(new_nick)
    
    1175 1175
     
    
    1176
    -    @event_filter(['account', 'room_jid'])
    
    1177 1176
         def _on_muc_user_status_show_changed(self, event):
    
    1178 1177
             nick = event.properties.muc_nickname
    
    1179 1178
             status = event.properties.status
    
    ... ... @@ -1422,7 +1421,6 @@ def _on_muc_destroyed(self, event):
    1422 1421
             if self._wait_for_destruction:
    
    1423 1422
                 self._close_control()
    
    1424 1423
     
    
    1425
    -    @event_filter(['account', 'jid=room_jid'])
    
    1426 1424
         def _on_message_sent(self, event):
    
    1427 1425
             if not event.message:
    
    1428 1426
                 return
    
    ... ... @@ -1482,7 +1480,6 @@ def send_message(self, message, xhtml=None, process_commands=True):
    1482 1480
                 self.msg_textview.get_buffer().set_text('')
    
    1483 1481
                 self.msg_textview.grab_focus()
    
    1484 1482
     
    
    1485
    -    @event_filter(['account', 'room_jid'])
    
    1486 1483
         def _on_message_error(self, event):
    
    1487 1484
             self.conv_textview.show_error(event.message_id, event.error)
    
    1488 1485