diff --git a/gajim/common/connection.py b/gajim/common/connection.py index fe6c0ab71..1252b685a 100644 --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -123,8 +123,8 @@ class CommonConnection: self.awaiting_cids = {} # Used for XEP-0231 - # Tracks the calls of the connect_maschine() method - self._connect_maschine_calls = 0 + # Tracks the calls of the connect_machine() method + self._connect_machine_calls = 0 self.get_config_values_or_default() @@ -1453,7 +1453,7 @@ class Connection(CommonConnection, ConnectionHandlers): # If we are not resuming, we ask for discovery info # and archiving preferences if not self.sm.supports_sm or (not self.sm.resuming and self.sm.enabled): - # This starts the connect_maschine + # This starts the connect_machine self.get_module('Discovery').discover_server_info() self.get_module('Discovery').discover_account_info() @@ -1470,15 +1470,15 @@ class Connection(CommonConnection, ConnectionHandlers): self._stun_servers = self._hosts = [i for i in result_array] @helpers.call_counter - def connect_maschine(self, restart=False): - log.info('Connect maschine state: %s', self._connect_maschine_calls) - if self._connect_maschine_calls == 1: + def connect_machine(self, restart=False): + log.info('Connect machine state: %s', self._connect_machine_calls) + if self._connect_machine_calls == 1: self.get_module('MetaContacts').get_metacontacts() - elif self._connect_maschine_calls == 2: + elif self._connect_machine_calls == 2: self.get_module('Delimiter').get_roster_delimiter() - elif self._connect_maschine_calls == 3: + elif self._connect_machine_calls == 3: self.get_module('Roster').request_roster() - elif self._connect_maschine_calls == 4: + elif self._connect_machine_calls == 4: self.send_first_presence() def send_custom_status(self, show, msg, jid): diff --git a/gajim/common/helpers.py b/gajim/common/helpers.py index 692576c25..8c41f0f08 100644 --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1512,7 +1512,7 @@ def get_emoticon_theme_path(theme): def call_counter(func): def helper(self, restart=False): if restart: - self._connect_maschine_calls = 0 - self._connect_maschine_calls += 1 + self._connect_machine_calls = 0 + self._connect_machine_calls += 1 return func(self, restart=False) return helper diff --git a/gajim/common/modules/delimiter.py b/gajim/common/modules/delimiter.py index 2f04d5d4e..96d4a1277 100644 --- a/gajim/common/modules/delimiter.py +++ b/gajim/common/modules/delimiter.py @@ -51,7 +51,7 @@ class Delimiter: else: self.set_roster_delimiter() - self._con.connect_maschine() + self._con.connect_machine() def set_roster_delimiter(self): log.info('Set delimiter') diff --git a/gajim/common/modules/discovery.py b/gajim/common/modules/discovery.py index 22c5bd0cd..eee6ba3c4 100644 --- a/gajim/common/modules/discovery.py +++ b/gajim/common/modules/discovery.py @@ -199,7 +199,7 @@ class Discovery: if nbxmpp.NS_ADDRESS in features: self._con.addressing_supported = True - self._con.connect_maschine() + self._con.connect_machine() def _parse_transports(self, from_, identities, features, data, node): for identity in identities: diff --git a/gajim/common/modules/metacontacts.py b/gajim/common/modules/metacontacts.py index ac921c6d4..15dab7115 100644 --- a/gajim/common/modules/metacontacts.py +++ b/gajim/common/modules/metacontacts.py @@ -53,7 +53,7 @@ class MetaContacts: app.nec.push_incoming_event(NetworkEvent( 'metacontacts-received', conn=self._con, meta_list=meta_list)) - self._con.connect_maschine() + self._con.connect_machine() @staticmethod def _parse_metacontacts(stanza): diff --git a/gajim/common/modules/roster.py b/gajim/common/modules/roster.py index 6d9efa489..ffa2df884 100644 --- a/gajim/common/modules/roster.py +++ b/gajim/common/modules/roster.py @@ -104,7 +104,7 @@ class Roster: roster=self._data.copy(), received_from_server=received_from_server)) - self._con.connect_maschine() + self._con.connect_machine() def _roster_push_received(self, con, stanza): log.info('Push received')