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

Commits:

2 changed files:

Changes:

  • gajim/application.py
    ... ... @@ -458,7 +458,7 @@ def _get_account_actions(account):
    458 458 
                 ('-start-chat', a.start_chat, 'online', 'as'),
    459 459 
                 ('-add-contact', a.on_add_contact, 'online', 'as'),
    460 460 
                 ('-services', a.on_service_disco, 'online', 's'),
    461 
    -            ('-profile', a.on_profile, 'feature', 's'),
    461 
    +            ('-profile', a.on_profile, 'online', 's'),
    462 462 
                 ('-server-info', a.on_server_info, 'online', 's'),
    463 463 
                 ('-archive', a.on_mam_preferences, 'feature', 's'),
    464 464 
                 ('-pep-config', a.on_pep_config, 'online', 's'),
    ... ... @@ -554,10 +554,7 @@ def _set_shortcuts(self):
    554 554 
                 self.set_accels_for_action(action, accels)
    555 555
    556 556 
         def _on_feature_discovered(self, event):
    557 
    -        if event.feature == Namespace.PUBSUB:
    558 
    -            action = '%s-profile' % event.account
    559 
    -            self.lookup_action(action).set_enabled(True)
    560 
    -        elif event.feature == Namespace.MAM_2:
    557 
    +        if event.feature == Namespace.MAM_2:
    561 558 
                 action = '%s-archive' % event.account
    562 559 
                 self.lookup_action(action).set_enabled(True)
    563 560 
             elif event.feature == Namespace.BLOCKING:

  • gajim/common/modules/vcard_temp.py
    ... ... @@ -42,10 +42,6 @@ def pass_disco(self, info):
    42 42 
             self.supported = True
    43 43 
             self._log.info('Discovered vcard-temp: %s', info.jid)
    44 44
    45 
    -        app.nec.push_incoming_event(NetworkEvent('feature-discovered',
    46 
    -                                                 account=self._account,
    47 
    -                                                 feature=Namespace.VCARD))
    48 
    -
    49 45
    50 46 
     def get_instance(*args, **kwargs):
    51 47 
         return VCardTemp(*args, **kwargs), 'VCardTemp'

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.