Philipp Hörist pushed to branch master at gajim / gajim
Commits:
791acd56 by lovetox at 2020-06-18T20:36:18+02:00
Disable client cert support until nbxmpp support is back
- - - - -
3f38952e by lovetox at 2020-06-18T20:36:18+02:00
Disable zeroconf support until its working again
- - - - -
2 changed files:
- gajim/gtk/accounts.py
- gajim/gui_interface.py
Changes:
=====================================
gajim/gtk/accounts.py
=====================================
@@ -61,6 +61,9 @@ class AccountsWindow(Gtk.ApplicationWindow):
self.add(box)
for account in app.get_accounts_sorted():
+ if account == 'Local':
+ # Disable zeroconf support until its working again
+ continue
self.add_account(account, initial=True)
self._menu.connect('menu-activated', self._on_menu_activated)
@@ -615,8 +618,10 @@ class GeneralPage(GenericSettingPage):
SettingType.ACTION, '-import-contacts',
props={'account': account}),
- Setting(SettingKind.DIALOG, _('Client Certificate'),
- SettingType.DIALOG, props={'dialog': CertificateDialog}),
+ # Currently not supported by nbxmpp
+ #
+ # Setting(SettingKind.DIALOG, _('Client Certificate'),
+ # SettingType.DIALOG, props={'dialog': CertificateDialog}),
Setting(SettingKind.SWITCH, _('Connect on startup'),
SettingType.ACCOUNT_CONFIG, 'autoconnect'),
=====================================
gajim/gui_interface.py
=====================================
@@ -1969,10 +1969,10 @@ class Interface:
self.register_core_handlers()
self.create_zeroconf_default_config()
- if app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'active') \
- and app.is_installed('ZEROCONF'):
- app.connections[app.ZEROCONF_ACC_NAME] = \
- connection_zeroconf.ConnectionZeroconf(app.ZEROCONF_ACC_NAME)
+ # if app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'active') \
+ # and app.is_installed('ZEROCONF'):
+ # app.connections[app.ZEROCONF_ACC_NAME] = \
+ # connection_zeroconf.ConnectionZeroconf(app.ZEROCONF_ACC_NAME)
for account in app.config.get_per('accounts'):
if not app.config.get_per('accounts', account, 'is_zeroconf') and\
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/6881d68e7cc6a4e677eb7637b734b39b30a9b7b5...3f38952ee6a2623ba666f0b683be67cd7da1041c
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/6881d68e7cc6a4e677eb7637b734b39b30a9b7b5...3f38952ee6a2623ba666f0b683be67cd7da1041c
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
