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

Commits:

6 changed files:

Changes:

  • gajim/common/config.py
    ... ... @@ -319,7 +319,6 @@ class Config:
    319 319 
                 'autoconnect': [opt_bool, False, '', True],
    320 320 
                 'autoconnect_as': [opt_str, 'online', _('Status used to autoconnect as. Can be online, chat, away, xa, dnd, invisible. NOTE: this option is used only if restore_last_status is disabled'), True],
    321 321 
                 'restore_last_status': [opt_bool, False, _('If enabled, restore the last status that was used.')],
    322 
    -            'autoreconnect': [opt_bool, True],
    323 322 
                 'autoauth': [opt_bool, False, _('If true, Contacts requesting authorization will be automatically accepted.')],
    324 323 
                 'active': [opt_bool, True, _('If False, this account will be disabled and will not appear in roster window.'), True],
    325 324 
                 'proxy': [opt_str, '', '', True],
    ... ... @@ -339,7 +338,6 @@ class Config:
    339 338 
                 'custom_host': [opt_str, '', '', True],
    340 339 
                 'sync_with_global_status': [opt_bool, False, ],
    341 340 
                 'no_log_for': [opt_str, '', _('Space separated list of JIDs for which you do not want to store logs. You can also add account name to log nothing for this account.')],
    342 
    -            'sync_logs_with_server': [opt_bool, True, _('On startup, Gajim will download logs stored on server, provided the server supports XEP-0313')],
    343 341 
                 'allow_no_log_for': [opt_str, '', _('Space separated list of JIDs for which you accept to not log conversations if he does not want to.')],
    344 342 
                 'attached_gpg_keys': [opt_str, ''],
    345 343 
                 'keep_alives_enabled': [opt_bool, True, _('Whitespace sent after inactivity')],
    ... ... @@ -383,7 +381,6 @@ class Config:
    383 381 
                 'send_idle_time': [opt_bool, True],
    384 382 
                 'roster_version': [opt_str, ''],
    385 383 
                 'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add')],
    386 
    -            'enable_message_carbons': [opt_bool, True, _('If enabled and if server supports this feature, Gajim will receive messages sent and received by other resources.')],
    387 384 
                 'ft_send_local_ips': [opt_bool, True, _('If enabled, Gajim will send your local IPs so your contact can connect to your machine to transfer files.')],
    388 385 
                 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which chat window will be re-opened on next startup.')],
    389 386 
                 'recent_groupchats': [opt_str, ''],

  • gajim/common/connection.py
    ... ... @@ -586,10 +586,6 @@ class Connection(CommonConnection, ConnectionHandlers):
    586 586 
             # Clear disconnect handlers
    587 587 
             self.connection.disconnect_handlers = []
    588 588
    589 
    -        if reconnect:
    590 
    -            reconnect = app.config.get_per(
    591 
    -                'accounts', self.name, 'autoreconnect')
    592 
    -
    593 589 
             log.info('Disconnect %s, reconnect: %s', self.name, reconnect)
    594 590
    595 591 
             if reconnect:

  • gajim/common/modules/carbons.py
    ... ... @@ -16,7 +16,6 @@
    16 16
    17 17 
     import nbxmpp
    18 18
    19 
    -from gajim.common import app
    20 19 
     from gajim.common.modules.base import BaseModule
    21 20
    22 21
    ... ... @@ -33,14 +32,11 @@ class Carbons(BaseModule):
    33 32 
             self.supported = True
    34 33 
             self._log.info('Discovered carbons: %s', from_)
    35 34
    36 
    -        if app.config.get_per('accounts', self._account,
    37 
    -                              'enable_message_carbons'):
    38 
    -            iq = nbxmpp.Iq('set')
    39 
    -            iq.setTag('enable', namespace=nbxmpp.NS_CARBONS)
    40 
    -            self._log.info('Activate')
    41 
    -            self._con.connection.send(iq)
    42 
    -        else:
    43 
    -            self._log.warning('Carbons deactivated (user setting)')
    35 
    +        iq = nbxmpp.Iq('set')
    36 
    +        iq.setTag('enable', namespace=nbxmpp.NS_CARBONS)
    37 
    +        self._log.info('Activate')
    38 
    +        self._con.connection.send(iq)
    39 
    +
    44 40
    45 41
    46 42 
     def get_instance(*args, **kwargs):

  • gajim/gtk/accounts.py
    ... ... @@ -753,29 +753,15 @@ class GeneralPage(GenericSettingPage):
    753 753 
                 Setting(SettingKind.SWITCH, _('Connect on startup'),
    754 754 
                         SettingType.ACCOUNT_CONFIG, 'autoconnect'),
    755 755
    756 
    -            Setting(SettingKind.SWITCH, _('Reconnect when connection is lost'),
    757 
    -                    SettingType.ACCOUNT_CONFIG, 'autoreconnect'),
    758 
    -
    759 756 
                 Setting(SettingKind.SWITCH,
    760 757 
                         _('Save conversations for all contacts'),
    761 758 
                         SettingType.ACCOUNT_CONFIG, 'no_log_for',
    762 759 
                         desc=_('Store conversations on the harddrive')),
    763 760
    764 
    -            Setting(SettingKind.SWITCH, _('Server Message Archive'),
    765 
    -                    SettingType.ACCOUNT_CONFIG, 'sync_logs_with_server',
    766 
    -                    desc=_('Messages get stored on the server. '
    767 
    -                           'The archive is used to sync messages '
    768 
    -                           'between multiple devices. (XEP-0313)')),
    769 
    -
    770 761 
                 Setting(SettingKind.SWITCH, _('Global Status'),
    771 762 
                         SettingType.ACCOUNT_CONFIG, 'sync_with_global_status',
    772 763 
                         desc=_('Synchronise the status of all accounts')),
    773 764
    774 
    -            Setting(SettingKind.SWITCH, _('Message Carbons'),
    775 
    -                    SettingType.ACCOUNT_CONFIG, 'enable_message_carbons',
    776 
    -                    desc=_('All your other online devices get copies '
    777 
    -                           'of sent and received messages. XEP-0280')),
    778 
    -
    779 765 
                 Setting(SettingKind.SWITCH, _('Use file transfer proxies'),
    780 766 
                         SettingType.ACCOUNT_CONFIG, 'use_ft_proxies'),
    781 767 
             ]

  • gajim/gtk/server_info.py
    ... ... @@ -160,11 +160,6 @@ class ServerInfoDialog(Gtk.Dialog):
    160 160 
             Feature = namedtuple('Feature',
    161 161 
                                  ['name', 'available', 'tooltip', 'enabled'])
    162 162
    163 
    -        carbons_enabled = app.config.get_per('accounts', self.account,
    164 
    -                                             'enable_message_carbons')
    165 
    -        mam_enabled = app.config.get_per('accounts', self.account,
    166 
    -                                         'sync_logs_with_server')
    167 
    -
    168 163 
             return [
    169 164 
                 Feature('XEP-0016: Privacy Lists',
    170 165 
                         con.get_module('PrivacyLists').supported, '', None),
    ... ... @@ -185,11 +180,10 @@ class ServerInfoDialog(Gtk.Dialog):
    185 180 
                         nbxmpp.NS_SECLABEL, None),
    186 181 
                 Feature('XEP-0280: Message Carbons',
    187 182 
                         con.get_module('Carbons').supported,
    188 
    -                    nbxmpp.NS_CARBONS, carbons_enabled),
    183 
    +                    nbxmpp.NS_CARBONS, None),
    189 184 
                 Feature('XEP-0313: Message Archive Management',
    190 185 
                         con.get_module('MAM').archiving_namespace,
    191 
    -                    con.get_module('MAM').archiving_namespace,
    192 
    -                    mam_enabled),
    186 
    +                    con.get_module('MAM').archiving_namespace, None),
    193 187 
                 Feature('XEP-0363: HTTP File Upload',
    194 188 
                         con.get_module('HTTPUpload').available,
    195 189 
                         con.get_module('HTTPUpload').httpupload_namespace, None),

  • gajim/gui_interface.py
    ... ... @@ -935,8 +935,7 @@ class Interface:
    935 935 
                 # Else disable autoaway
    936 936 
                 app.sleeper_state[account] = 'off'
    937 937
    938 
    -        if obj.conn.get_module('MAM').available and app.config.get_per('accounts',
    939 
    -        account, 'sync_logs_with_server'):
    938 
    +        if obj.conn.get_module('MAM').available:
    940 939 
                 obj.conn.get_module('MAM').request_archive_on_signin()
    941 940
    942 941 
             invisible_show = app.SHOW_LIST.index('invisible')

    • —
    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.