Remove all the Slot() decorators.

This causes (on certain scenarios) the app to segfault and it is really
hard to debug.

14 files changed, 0 insertions, 120 deletions

diff --git a/src/leap/bitmask/gui/advanced_key_management.py b/src/leap/bitmask/gui/advanced_key_management.py
index 48a1db93..7d147b7b 100644
--- a/src/leap/bitmask/gui/advanced_key_management.py
+++ b/src/leap/bitmask/gui/advanced_key_management.py
@@ -132,7 +132,6 @@ class AdvancedKeyManagement(QtGui.QDialog):
         else:
             logger.debug('Import canceled by the user.')
 
-    @QtCore.Slot()
     def _keymanager_import_ok(self):
         """
         TRIGGERS:
@@ -144,7 +143,6 @@ class AdvancedKeyManagement(QtGui.QDialog):
             self, self.tr("Import Successful"),
             self.tr("The key pair was imported successfully."))
 
-    @QtCore.Slot()
     def _import_ioerror(self):
         """
         TRIGGERS:
@@ -157,7 +155,6 @@ class AdvancedKeyManagement(QtGui.QDialog):
             self.tr("There was an error accessing the file.\n"
                     "Import canceled."))
 
-    @QtCore.Slot()
     def _import_datamismatch(self):
         """
         TRIGGERS:
@@ -171,7 +168,6 @@ class AdvancedKeyManagement(QtGui.QDialog):
                     "same address and fingerprint.\n"
                     "Import canceled."))
 
-    @QtCore.Slot()
     def _import_missingkey(self):
         """
         TRIGGERS:
@@ -185,7 +181,6 @@ class AdvancedKeyManagement(QtGui.QDialog):
                     "key in the same file.\n"
                     "Import canceled."))
 
-    @QtCore.Slot()
     def _import_addressmismatch(self):
         """
         TRIGGERS:
@@ -212,7 +207,6 @@ class AdvancedKeyManagement(QtGui.QDialog):
         else:
             logger.debug('Export canceled by the user.')
 
-    @QtCore.Slot()
     def _keymanager_export_ok(self):
         """
         TRIGGERS:
@@ -225,7 +219,6 @@ class AdvancedKeyManagement(QtGui.QDialog):
             self.tr("The key pair was exported successfully.\n"
                     "Please, store your private key in a safe place."))
 
-    @QtCore.Slot()
     def _keymanager_export_error(self):
         """
         TRIGGERS:
@@ -238,7 +231,6 @@ class AdvancedKeyManagement(QtGui.QDialog):
             self.tr("There was an error accessing the file.\n"
                     "Export canceled."))
 
-    @QtCore.Slot()
     def _keymanager_keys_list(self, keys):
         """
         TRIGGERS:
diff --git a/src/leap/bitmask/gui/app.py b/src/leap/bitmask/gui/app.py
index 75dc4a38..5fe031b1 100644
--- a/src/leap/bitmask/gui/app.py
+++ b/src/leap/bitmask/gui/app.py
@@ -50,7 +50,6 @@ class App(QtGui.QWidget):
         self._backend_checker.timeout.connect(self._check_backend_status)
         self._backend_checker.start(2000)
 
-    @QtCore.Slot()
     def _check_backend_status(self):
         """
         TRIGGERS:
diff --git a/src/leap/bitmask/gui/eip_preferenceswindow.py b/src/leap/bitmask/gui/eip_preferenceswindow.py
index b5788f3c..8939c709 100644
--- a/src/leap/bitmask/gui/eip_preferenceswindow.py
+++ b/src/leap/bitmask/gui/eip_preferenceswindow.py
@@ -99,7 +99,6 @@ class EIPPreferencesWindow(QtGui.QDialog):
 
         self._backend.eip_get_initialized_providers(domains=providers)
 
-    @QtCore.Slot(list)
     def _load_providers_in_combo(self, providers):
         """
         TRIGGERS:
@@ -132,7 +131,6 @@ class EIPPreferencesWindow(QtGui.QDialog):
                 domain, QtCore.Qt.MatchStartsWith)
             self.ui.cbProvidersGateway.setCurrentIndex(provider_index)
 
-    @QtCore.Slot(str)
     def _save_selected_gateway(self, provider):
         """
         TRIGGERS:
@@ -159,7 +157,6 @@ class EIPPreferencesWindow(QtGui.QDialog):
             "Gateway settings for provider '{0}' saved.").format(provider)
         self._set_providers_gateway_status(msg, success=True)
 
-    @QtCore.Slot(int)
     def _populate_gateways(self, domain_idx):
         """
         TRIGGERS:
@@ -182,7 +179,6 @@ class EIPPreferencesWindow(QtGui.QDialog):
 
         self._backend.eip_get_gateways_list(domain=domain)
 
-    @QtCore.Slot(list)
     def _update_gateways_list(self, gateways):
         """
         TRIGGERS:
@@ -223,7 +219,6 @@ class EIPPreferencesWindow(QtGui.QDialog):
 
         self.ui.cbGateways.setCurrentIndex(index)
 
-    @QtCore.Slot()
     def _gateways_list_error(self):
         """
         TRIGGERS:
@@ -238,7 +233,6 @@ class EIPPreferencesWindow(QtGui.QDialog):
         self.ui.pbSaveGateway.setEnabled(False)
         self.ui.cbGateways.setEnabled(False)
 
-    @QtCore.Slot()
     def _gateways_list_uninitialized(self):
         """
         TRIGGERS:
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index 14ff5972..83490cac 100644
--- a/src/leap/bitmask/gui/eip_status.py
+++ b/src/leap/bitmask/gui/eip_status.py
@@ -137,7 +137,6 @@ class EIPStatusWidget(QtGui.QWidget):
         self.ui.btnUpload.clicked.connect(onclicked)
         self.ui.btnDownload.clicked.connect(onclicked)
 
-    @QtCore.Slot()
     def _on_VPN_status_clicked(self):
         """
         TRIGGERS:
@@ -295,7 +294,6 @@ class EIPStatusWidget(QtGui.QWidget):
         msg = self.tr("Encrypted Internet is starting")
         self.set_eip_message(msg)
 
-    @QtCore.Slot()
     def disable_eip_start(self):
         """
         Triggered when a default provider_config has not been found.
@@ -327,7 +325,6 @@ class EIPStatusWidget(QtGui.QWidget):
                 self._eip_disabled_action)
             self._eip_status_menu.menuAction().setVisible(False)
 
-    @QtCore.Slot()
     def enable_eip_start(self):
         """
         Triggered after a successful login.
@@ -452,7 +449,6 @@ class EIPStatusWidget(QtGui.QWidget):
         self.user_cancelled = True
         self.hide_eip_cancel_button()
 
-    @QtCore.Slot(dict)
     def eip_stopped(self, restart=False, failed=False):
         """
         TRIGGERS:
@@ -500,7 +496,6 @@ class EIPStatusWidget(QtGui.QWidget):
                                     "unencrypted traffic."))
         self.show_fw_down_button()
 
-    @QtCore.Slot(dict)
     def update_vpn_status(self, data=None):
         """
         TRIGGERS:
@@ -535,7 +530,6 @@ class EIPStatusWidget(QtGui.QWidget):
         self.ui.btnUpload.setText(upload_str)
         self.ui.btnDownload.setText(download_str)
 
-    @QtCore.Slot(dict)
     def update_vpn_state(self, vpn_state):
         """
         TRIGGERS:
@@ -674,7 +668,6 @@ class EIPStatusWidget(QtGui.QWidget):
     # Slots for signals
     #
 
-    @QtCore.Slot()
     def _on_eip_connection_aborted(self):
         """
         TRIGGERS:
@@ -773,7 +766,6 @@ class EIPStatusWidget(QtGui.QWidget):
         """
         self.eip_conductor.reconnect_stop_signal()
 
-    @QtCore.Slot()
     def _on_eip_network_unreachable(self):
         """
         TRIGGERS:
diff --git a/src/leap/bitmask/gui/login.py b/src/leap/bitmask/gui/login.py
index 8b764025..90df0b73 100644
--- a/src/leap/bitmask/gui/login.py
+++ b/src/leap/bitmask/gui/login.py
@@ -133,7 +133,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
 
         self._set_logged_out()
 
-    @QtCore.Slot(int)
     def _remember_state_changed(self, state):
         """
         Save the remember state in the LeapSettings.
@@ -145,7 +144,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
         # are: Checked, Unchecked and PartiallyChecked
         self._settings.set_remember(state == QtCore.Qt.Checked)
 
-    @QtCore.Slot(unicode)
     def _credentials_changed(self, text):
         """
         TRIGGER:
@@ -431,7 +429,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
         self._backend.user_cancel_login()
         self._set_logged_out()
 
-    @QtCore.Slot()
     def _set_login_cancelled(self):
         """
         TRIGGERS:
@@ -443,7 +440,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
         self.set_status(self.tr("Log in cancelled by the user."))
         self.set_enabled(True)
 
-    @QtCore.Slot(dict)
     def _provider_setup_intermediate(self, data):
         """
         TRIGGERS:
@@ -457,7 +453,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
             logger.error(data[ERROR_KEY])
             self._login_problem_provider()
 
-    @QtCore.Slot()
     def _login_problem_provider(self):
         """
         Warn the user about a problem with the provider during login.
@@ -465,7 +460,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
         self.set_status(self.tr("Unable to login: Problem with provider"))
         self.set_enabled(True)
 
-    @QtCore.Slot(dict)
     def _load_provider_config(self, data):
         """
         TRIGGERS:
@@ -485,7 +479,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
 
         self._backend.provider_bootstrap(provider=self._provider)
 
-    @QtCore.Slot(dict)
     def _provider_config_loaded(self, data):
         """
         TRIGGERS:
@@ -528,7 +521,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
         self.ui.logged_widget.show()
         self.ui.lblUser.setText(fullname)
 
-    @QtCore.Slot()
     def _authentication_finished(self):
         """
         TRIGGERS:
@@ -543,7 +535,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
         if not flags.OFFLINE:
             self.login_finished.emit()
 
-    @QtCore.Slot(unicode)
     def _authentication_error(self, msg):
         """
         TRIGGERS:
@@ -575,7 +566,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
         self.set_enabled(True)
         self.set_status("", error=False)
 
-    @QtCore.Slot()
     def do_logout(self):
         """
         TRIGGER:
@@ -613,7 +603,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
             self.ui.btnLogout.setEnabled(True)
             self.ui.clblErrorMsg.hide()
 
-    @QtCore.Slot()
     def _logout_error(self):
         """
         TRIGGER:
@@ -624,7 +613,6 @@ class LoginWidget(QtGui.QWidget, SignalTracker):
         self._set_logging_out(False)
         self.set_status(self.tr("Something went wrong with the logout."))
 
-    @QtCore.Slot()
     def _logout_ok(self):
         """
         TRIGGER:
diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py
index 92e1e4c4..bbfbafb5 100644
--- a/src/leap/bitmask/gui/mail_status.py
+++ b/src/leap/bitmask/gui/mail_status.py
@@ -184,7 +184,6 @@ class MailStatusWidget(QtGui.QWidget):
         leap_assert_type(action_mail_status, QtGui.QAction)
         self._action_mail_status = action_mail_status
 
-    @QtCore.Slot()
     def set_soledad_failed(self):
         """
         TRIGGERS:
@@ -195,7 +194,6 @@ class MailStatusWidget(QtGui.QWidget):
         msg = self.tr("There was an unexpected problem with Soledad.")
         self._set_mail_status(msg, ready=-1)
 
-    @QtCore.Slot()
     def set_soledad_invalid_auth_token(self):
         """
         TRIGGERS:
@@ -250,7 +248,6 @@ class MailStatusWidget(QtGui.QWidget):
         """
         self._soledad_event.emit(req)
 
-    @QtCore.Slot(object)
     def _mail_handle_soledad_events_slot(self, req):
         """
         TRIGGERS:
@@ -285,7 +282,6 @@ class MailStatusWidget(QtGui.QWidget):
         """
         self._keymanager_event.emit(req)
 
-    @QtCore.Slot(object)
     def _mail_handle_keymanager_events_slot(self, req):
         """
         TRIGGERS:
@@ -332,7 +328,6 @@ class MailStatusWidget(QtGui.QWidget):
         """
         self._smtp_event.emit(req)
 
-    @QtCore.Slot(object)
     def _mail_handle_smtp_events_slot(self, req):
         """
         TRIGGERS:
@@ -367,7 +362,6 @@ class MailStatusWidget(QtGui.QWidget):
         """
         self._imap_event.emit(req)
 
-    @QtCore.Slot(object)
     def _mail_handle_imap_events_slot(self, req):
         """
         TRIGGERS:
@@ -419,7 +413,6 @@ class MailStatusWidget(QtGui.QWidget):
 
     # XXX make the signal emit the label and state.
 
-    @QtCore.Slot()
     def mail_state_disconnected(self):
         """
         Display the correct UI for the disconnected state.
@@ -431,7 +424,6 @@ class MailStatusWidget(QtGui.QWidget):
         else:
             self._set_mail_status(self.tr("OFF"), -1)
 
-    @QtCore.Slot()
     def mail_state_connecting(self):
         """
         Display the correct UI for the connecting state.
@@ -440,21 +432,18 @@ class MailStatusWidget(QtGui.QWidget):
         self._started = True
         self._set_mail_status(self.tr("Starting..."), 1)
 
-    @QtCore.Slot()
     def mail_state_disconnecting(self):
         """
         Display the correct UI for the connecting state.
         """
         self._set_mail_status(self.tr("Disconnecting..."), 1)
 
-    @QtCore.Slot()
     def mail_state_connected(self):
         """
         Display the correct UI for the connected state.
         """
         self._set_mail_status(self.tr("ON"), 2)
 
-    @QtCore.Slot()
     def mail_state_disabled(self):
         """
         Display the correct UI for the disabled state.
@@ -464,7 +453,6 @@ class MailStatusWidget(QtGui.QWidget):
             self._service_name)
         self._set_mail_status(status, -1)
 
-    @QtCore.Slot()
     def soledad_invalid_auth_token(self):
         """
         Display the correct UI for the invalid token state
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index a2244020..bbb43b94 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -515,7 +515,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
                 return h
         return None
 
-    @QtCore.Slot()
     def _show_logger_window(self):
         """
         TRIGGERS:
@@ -532,7 +531,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
             lw = LoggerWindow(self, handler=leap_log_handler)
             lw.show()
 
-    @QtCore.Slot()
     def _show_AKM(self):
         """
         TRIGGERS:
@@ -552,7 +550,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
                                     self._backend, self._soledad_started)
         akm.show()
 
-    @QtCore.Slot()
     def _show_preferences(self):
         """
         TRIGGERS:
@@ -572,7 +569,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         pref_win = PreferencesWindow(self, account, self.app)
         pref_win.show()
 
-    @QtCore.Slot(object, list)
     def _update_eip_enabled_status(self, account=None, services=None):
         """
         TRIGGER:
@@ -679,7 +675,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         # so we must update it, otherwise we're in a deadlock.
         self._trying_to_start_eip = False
 
-    @QtCore.Slot()
     def _disable_eip_missing_helpers(self):
         """
         TRIGGERS:
@@ -702,7 +697,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         """
         self.new_updates.emit(req)
 
-    @QtCore.Slot(object)
     def _react_to_new_updates(self, req):
         """
         TRIGGERS:
@@ -718,7 +712,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         self.ui.btnMore.setVisible(True)
         self._updates_content = req.content
 
-    @QtCore.Slot()
     def _updates_details(self):
         """
         TRIGGERS:
@@ -746,7 +739,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
                                       self.tr("Updates available"),
                                       msg)
 
-    @QtCore.Slot()
     def _finish_init(self):
         """
         TRIGGERS:
@@ -893,7 +885,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
             # we wait for the systray to be ready
             QtDelayedCall(1000, hello)
 
-    @QtCore.Slot(int)
     def _tray_activated(self, reason=None):
         """
         TRIGGERS:
@@ -912,7 +903,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
             # this works however.
             context_menu.exec_(self._systray.geometry().center())
 
-    @QtCore.Slot()
     def _ensure_visible(self):
         """
         TRIGGERS:
@@ -931,7 +921,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         self.activateWindow()
         self.raise_()
 
-    @QtCore.Slot()
     def _ensure_invisible(self):
         """
         TRIGGERS:
@@ -967,7 +956,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         if state is not None:
             self.restoreState(state)
 
-    @QtCore.Slot()
     def _about(self):
         """
         TRIGGERS:
@@ -995,7 +983,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         msg = msg.format(ver=VERSION, ver_hash=VERSION_HASH[:10], greet=greet)
         QtGui.QMessageBox.about(self, title, msg)
 
-    @QtCore.Slot()
     def _help(self):
         """
         TRIGGERS:
@@ -1097,7 +1084,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         skip_first_run = self._settings.get_skip_first_run()
         return not (has_provider_on_disk and skip_first_run)
 
-    @QtCore.Slot()
     def _disconnect_login_wait(self):
         """
         Disconnect the EIP finishing signal to the wait flag on the login
@@ -1115,7 +1101,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
             # signal not connected
             pass
 
-    @QtCore.Slot(object)
     def _on_provider_changed(self, wizard=True):
         """
         TRIGGERS:
@@ -1173,7 +1158,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
                 # if wizard, the widget restores itself
                 self._providers.restore_previous_provider()
 
-    @QtCore.Slot()
     def _login(self):
         """
         TRIGGERS:
@@ -1201,7 +1185,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
 
         self._soledad_started = False
 
-    @QtCore.Slot()
     def _on_user_logged_in(self):
         """
         TRIGGERS:
@@ -1230,7 +1213,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         if MX_SERVICE not in self._provider_details['services']:
             self._set_mx_visible(False)
 
-    @QtCore.Slot()
     def _on_user_logged_out(self):
         """
         TRIGGER:
@@ -1259,7 +1241,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
 
         self._maybe_start_eip()
 
-    @QtCore.Slot()
     def _get_provider_details(self, data):
         """
         TRIGGERS:
@@ -1273,7 +1254,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         lang = QtCore.QLocale.system().name()
         self._backend.provider_get_details(domain=domain, lang=lang)
 
-    @QtCore.Slot()
     def _provider_get_details(self, details):
         """
         Set the details for the just downloaded provider.
@@ -1317,7 +1297,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
 
         return eip_enabled and eip_provided
 
-    @QtCore.Slot()
     def _maybe_run_soledad_setup_checks(self):
         """
         TRIGGERS:
@@ -1358,7 +1337,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
     ###################################################################
     # Service control methods: soledad
 
-    @QtCore.Slot()
     def _on_soledad_ready(self):
         """
         TRIGGERS:
@@ -1373,7 +1351,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
 
     ###################################################################
     # Service control methods: mail
-    @QtCore.Slot()
     def _start_mail_service(self):
         if self._provides_mx_and_enabled() or flags.OFFLINE:
             self._mail_conductor.start_mail_service(download_if_needed=True,
@@ -1382,14 +1359,12 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
     ###################################################################
     # Service control methods: eip
 
-    @QtCore.Slot()
     def _disable_eip_start_action(self):
         """
         Disable the EIP start action in the systray menu.
         """
         self._action_eip_startstop.setEnabled(False)
 
-    @QtCore.Slot()
     def _enable_eip_start_action(self):
         """
         Enable the EIP start action in the systray menu.
@@ -1397,7 +1372,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         self._action_eip_startstop.setEnabled(True)
         self._eip_status.enable_eip_start()
 
-    @QtCore.Slot()
     def _on_eip_connecting(self):
         """
         TRIGGERS:
@@ -1421,7 +1395,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         eip_sigs.connection_aborted_signal.connect(slot)
         eip_sigs.connection_died_signal.connect(slot)
 
-    @QtCore.Slot()
     def _on_eip_connection_connected(self):
         """
         TRIGGERS:
@@ -1441,7 +1414,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         # check for connectivity
         self._backend.eip_check_dns(domain=domain)
 
-    @QtCore.Slot()
     def _on_eip_connection_disconnected(self):
         """
         TRIGGERS:
@@ -1451,7 +1423,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         """
         self._already_started_eip = False
 
-    @QtCore.Slot()
     def _set_eip_provider(self, country_code=None):
         """
         TRIGGERS:
@@ -1463,7 +1434,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         domain = self._providers.get_selected_provider()
         self._eip_status.set_provider(domain, country_code)
 
-    @QtCore.Slot()
     def _eip_dns_error(self):
         """
         Trigger this if we don't have a working DNS resolver.
@@ -1555,7 +1525,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
             # eip will not start, so we start soledad anyway
             self._maybe_run_soledad_setup_checks()
 
-    @QtCore.Slot(dict)
     def _finish_eip_bootstrap(self, data):
         """
         TRIGGERS:
@@ -1576,7 +1545,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
         # DO START EIP Connection!
         self._eip_conductor.do_connect()
 
-    @QtCore.Slot(dict)
     def _eip_intermediate_stage(self, data):
         # TODO missing param documentation
         """
@@ -1610,7 +1578,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
             locks.raise_window_ack()
         self.raise_window.emit()
 
-    @QtCore.Slot()
     def _do_raise_mainwindow(self):
         """
         TRIGGERS:
@@ -1713,7 +1680,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
             logger.debug("Killing backend")
             psutil.Process(self._backend_pid).kill()
 
-    @QtCore.Slot()
     def _remove_service(self, service):
         """
         Remove the given service from the waiting list and check if we have
@@ -1730,7 +1696,6 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
             logger.debug("All services stopped.")
             self.all_services_stopped.emit()
 
-    @QtCore.Slot()
     def final_quit(self):
         """
         Final steps to quit the app, starting from here we don't care about
diff --git a/src/leap/bitmask/gui/passwordwindow.py b/src/leap/bitmask/gui/passwordwindow.py
index f7ef079e..88565829 100644
--- a/src/leap/bitmask/gui/passwordwindow.py
+++ b/src/leap/bitmask/gui/passwordwindow.py
@@ -149,7 +149,6 @@ class PasswordWindow(QtGui.QDialog, Flashable):
         self._soledad_ready = False
         sig.soledad_bootstrap_finished.connect(self._on_soledad_ready)
 
-    @QtCore.Slot()
     def _change_password(self):
         """
         TRIGGERS:
@@ -194,7 +193,6 @@ class PasswordWindow(QtGui.QDialog, Flashable):
         PasswordWindow._current_window = None
         self.deleteLater()
 
-    @QtCore.Slot()
     def _srp_change_password_ok(self):
         """
         TRIGGERS:
@@ -210,7 +208,6 @@ class PasswordWindow(QtGui.QDialog, Flashable):
         else:
             self._change_password_success()
 
-    @QtCore.Slot()
     def _srp_password_change_error(self):
         """
         TRIGGERS:
@@ -223,7 +220,6 @@ class PasswordWindow(QtGui.QDialog, Flashable):
         self._enable_password_widgets(True)
         self.flash_error(msg)
 
-    @QtCore.Slot()
     def _srp_password_change_badpw(self):
         """
         TRIGGERS:
@@ -237,7 +233,6 @@ class PasswordWindow(QtGui.QDialog, Flashable):
         self.flash_error(msg)
         self.ui.current_password_lineedit.setFocus()
 
-    @QtCore.Slot()
     def _soledad_change_password_ok(self):
         """
         TRIGGERS:
@@ -248,7 +243,6 @@ class PasswordWindow(QtGui.QDialog, Flashable):
         logger.debug("Soledad password changed successfully.")
         self._change_password_success()
 
-    @QtCore.Slot(unicode)
     def _soledad_change_password_problem(self, msg):
         """
         TRIGGERS:
@@ -263,7 +257,6 @@ class PasswordWindow(QtGui.QDialog, Flashable):
         self._enable_password_widgets(True)
         self.flash_error(msg)
 
-    @QtCore.Slot()
     def _on_soledad_ready(self):
         """
         TRIGGERS:
diff --git a/src/leap/bitmask/gui/preferences_account_page.py b/src/leap/bitmask/gui/preferences_account_page.py
index ec6a7716..cab90eec 100644
--- a/src/leap/bitmask/gui/preferences_account_page.py
+++ b/src/leap/bitmask/gui/preferences_account_page.py
@@ -63,7 +63,6 @@ class PreferencesAccountPage(QtGui.QWidget):
             self.ui.change_password_label.setVisible(True)
             self.ui.change_password_button.setEnabled(False)
 
-    @QtCore.Slot(str, int)
     def _service_selection_changed(self, service, state):
         """
         TRIGGERS:
@@ -94,7 +93,6 @@ class PreferencesAccountPage(QtGui.QWidget):
         # emit signal alerting change
         self.app.service_selection_changed.emit(self.account, services)
 
-    @QtCore.Slot(str)
     def _load_services(self, services):
         """
         TRIGGERS:
@@ -133,7 +131,6 @@ class PreferencesAccountPage(QtGui.QWidget):
                 logger.error("Something went wrong while trying to "
                              "load service %s" % (service,))
 
-    @QtCore.Slot()
     def _show_change_password(self):
         change_password_window = PasswordWindow(self, self.account, self.app)
         change_password_window.show()
diff --git a/src/leap/bitmask/gui/preferences_vpn_page.py b/src/leap/bitmask/gui/preferences_vpn_page.py
index 901116b4..5b5c9604 100644
--- a/src/leap/bitmask/gui/preferences_vpn_page.py
+++ b/src/leap/bitmask/gui/preferences_vpn_page.py
@@ -64,7 +64,6 @@ class PreferencesVpnPage(QtGui.QWidget, Flashable):
         # Trigger update
         self.app.backend.eip_get_gateways_list(domain=self.account.domain)
 
-    @QtCore.Slot(str)
     def _save_selected_gateway(self, index):
         """
         TRIGGERS:
@@ -86,7 +85,6 @@ class PreferencesVpnPage(QtGui.QWidget, Flashable):
             provider=self.account.domain,
             gateway=gateway)
 
-    @QtCore.Slot(list)
     def _update_gateways_list(self, gateways):
         """
         TRIGGERS:
@@ -116,7 +114,6 @@ class PreferencesVpnPage(QtGui.QWidget, Flashable):
                 index = idx + 1
         self.ui.gateways_list.setCurrentRow(index)
 
-    @QtCore.Slot()
     def _gateways_list_error(self):
         """
         TRIGGERS:
@@ -129,7 +126,6 @@ class PreferencesVpnPage(QtGui.QWidget, Flashable):
             self.tr("Error loading configuration file."))
         self.ui.gateways_list.setEnabled(False)
 
-    @QtCore.Slot()
     def _gateways_list_uninitialized(self):
         """
         TRIGGERS:
diff --git a/src/leap/bitmask/gui/preferenceswindow.py b/src/leap/bitmask/gui/preferenceswindow.py
index f1252301..daad08b0 100644
--- a/src/leap/bitmask/gui/preferenceswindow.py
+++ b/src/leap/bitmask/gui/preferenceswindow.py
@@ -152,7 +152,6 @@ class PreferencesWindow(QtGui.QDialog):
         self._email_page.deleteLater()
         self.deleteLater()
 
-    @QtCore.Slot()
     def _change_page(self, current, previous):
         """
         TRIGGERS:
@@ -170,7 +169,6 @@ class PreferencesWindow(QtGui.QDialog):
             current = previous
         self.ui.pages_widget.setCurrentIndex(self.ui.nav_widget.row(current))
 
-    @QtCore.Slot(object, list)
     def _update_icons(self, account, services):
         """
         TRIGGERS:
diff --git a/src/leap/bitmask/gui/providers.py b/src/leap/bitmask/gui/providers.py
index 6954411f..4a6f961a 100644
--- a/src/leap/bitmask/gui/providers.py
+++ b/src/leap/bitmask/gui/providers.py
@@ -98,7 +98,6 @@ class Providers(QtCore.QObject):
         self._combo.setCurrentIndex(prev_provider)
         self._combo.blockSignals(False)
 
-    @QtCore.Slot(int)
     def _current_provider_changed(self, idx):
         """
         TRIGGERS:
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index a30723f2..5da021d1 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -134,7 +134,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         self._provider_setup_ok = False
         self.finished.connect(self._wizard_finished)
 
-    @QtCore.Slot()
     def _wizard_finished(self):
         """
         TRIGGERS:
@@ -245,7 +244,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
     def get_services(self):
         return self._selected_services
 
-    @QtCore.Slot(unicode)
     def _enable_check(self, reset=True):
         """
         TRIGGERS:
@@ -335,7 +333,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         # register button
         self.ui.btnRegister.setVisible(visible)
 
-    @QtCore.Slot()
     def _registration_finished(self):
         """
         TRIGGERS:
@@ -361,7 +358,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         self.page(self.REGISTER_USER_PAGE).set_completed()
         self.button(QtGui.QWizard.BackButton).setEnabled(False)
 
-    @QtCore.Slot()
     def _registration_failed(self):
         """
         TRIGGERS:
@@ -375,7 +371,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         self._set_register_status(error_msg, error=True)
         self.ui.btnRegister.setEnabled(True)
 
-    @QtCore.Slot()
     def _registration_taken(self):
         """
         TRIGGERS:
@@ -422,7 +417,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         self.ui.lblCheckCaFpr.setPixmap(None)
         self.ui.lblCheckApiCert.setPixmap(None)
 
-    @QtCore.Slot()
     def _check_provider(self):
         """
         TRIGGERS:
@@ -456,7 +450,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         self.ui.lblNameResolution.setPixmap(self.QUESTION_ICON)
         self._backend.provider_setup(provider=self._domain)
 
-    @QtCore.Slot(bool)
     def _skip_provider_checks(self, skip):
         """
         TRIGGERS:
@@ -500,7 +493,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
             label.setPixmap(self.ERROR_ICON)
             logger.error(error)
 
-    @QtCore.Slot(dict)
     def _name_resolution(self, data):
         """
         TRIGGERS:
@@ -520,7 +512,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         self.ui.btnCheck.setEnabled(not passed)
         self.ui.lnProvider.setEnabled(not passed)
 
-    @QtCore.Slot(dict)
     def _https_connection(self, data):
         """
         TRIGGERS:
@@ -540,7 +531,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         self.ui.btnCheck.setEnabled(not passed)
         self.ui.lnProvider.setEnabled(not passed)
 
-    @QtCore.Slot(dict)
     def _download_provider_info(self, data):
         """
         TRIGGERS:
@@ -576,7 +566,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         else:
             self.ui.cbProviders.setEnabled(True)
 
-    @QtCore.Slot()
     def _provider_get_details(self, details):
         """
         Set the details for the just downloaded provider.
@@ -586,7 +575,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         """
         self._provider_details = details
 
-    @QtCore.Slot(dict)
     def _download_ca_cert(self, data):
         """
         TRIGGERS:
@@ -599,7 +587,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         if passed:
             self.ui.lblCheckCaFpr.setPixmap(self.QUESTION_ICON)
 
-    @QtCore.Slot(dict)
     def _check_ca_fingerprint(self, data):
         """
         TRIGGERS:
@@ -612,7 +599,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
         if passed:
             self.ui.lblCheckApiCert.setPixmap(self.QUESTION_ICON)
 
-    @QtCore.Slot(dict)
     def _check_api_certificate(self, data):
         """
         TRIGGERS:
@@ -626,7 +612,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
                             True, self.SETUP_PROVIDER_PAGE)
         self._provider_setup_ok = True
 
-    @QtCore.Slot(str, int)
     def _service_selection_changed(self, service, state):
         """
         TRIGGERS:
@@ -675,7 +660,6 @@ class Wizard(QtGui.QWizard, SignalTracker):
                     self.tr("Something went wrong while trying to "
                             "load service %s" % (service,)))
 
-    @QtCore.Slot(int)
     def _current_id_changed(self, pageId):
         """
         TRIGGERS:
diff --git a/src/leap/bitmask/services/eip/conductor.py b/src/leap/bitmask/services/eip/conductor.py
index 01dd7449..3fc88724 100644
--- a/src/leap/bitmask/services/eip/conductor.py
+++ b/src/leap/bitmask/services/eip/conductor.py
@@ -130,7 +130,6 @@ class EIPConductor(object):
         """
         self.qtsigs.do_disconnect_signal.emit()
 
-    @QtCore.Slot()
     def _start_eip(self):
         """
         Start EIP.
@@ -174,7 +173,6 @@ class EIPConductor(object):
         self.qtsigs.disconnecting_signal.disconnect()
         self.qtsigs.disconnecting_signal.connect(do_stop)
 
-    @QtCore.Slot()
     def _stop_eip(self, restart=False, failed=False):
         """
         TRIGGERS:
@@ -244,7 +242,6 @@ class EIPConductor(object):
         if restart:
             QtDelayedCall(2000, self.reconnect_stop_signal)
 
-    @QtCore.Slot()
     def _do_eip_restart(self):
         """
         TRIGGERS:
@@ -266,7 +263,6 @@ class EIPConductor(object):
         self.qtsigs.disconnecting_signal.connect(do_stop)
         self.qtsigs.do_disconnect_signal.emit()
 
-    @QtCore.Slot()
     def _do_eip_failed(self):
         """
         Stop EIP after a failure to start.
@@ -278,7 +274,6 @@ class EIPConductor(object):
         self.qtsigs.connection_died_signal.emit()
         QtDelayedCall(1000, self._eip_status.eip_failed_to_connect)
 
-    @QtCore.Slot(int)
     def _eip_finished(self, exitCode):
         """
         TRIGGERS: