diff src/core/sat_main.py @ 1059:b2b9c184033f

core, frontends: remove bridge method "connect" (always use asyncConnect)
author souliane <souliane@mailoo.org>
date Fri, 23 May 2014 10:40:54 +0200
parents e88bff4c8b77
children 6ec513ad92c2
line wrap: on
line diff
--- a/src/core/sat_main.py	Thu May 29 14:34:01 2014 +0200
+++ b/src/core/sat_main.py	Fri May 23 10:40:54 2014 +0200
@@ -86,7 +86,6 @@
         self.bridge.register("getEntityData", lambda _jid, keys, profile: self.memory.getEntityData(jid.JID(_jid), keys, profile))
         self.bridge.register("asyncCreateProfile", self.memory.asyncCreateProfile)
         self.bridge.register("asyncDeleteProfile", self.memory.asyncDeleteProfile)
-        self.bridge.register("connect", self.connect)
         self.bridge.register("asyncConnect", self.asyncConnect)
         self.bridge.register("disconnect", self.disconnect)
         self.bridge.register("getContacts", self.getContacts)
@@ -183,14 +182,6 @@
             self.plugins[import_name].is_handler = False
         #TODO: test xmppclient presence and register handler parent
 
-    def connect(self, profile_key=C.PROF_KEY_NONE, password=''):
-        """Connect to jabber server
-
-        @param password (string): the SàT profile password
-        @param profile_key: %(doc_profile_key)s
-        """
-        self.asyncConnect(profile_key, password)
-
     def asyncConnect(self, profile_key=C.PROF_KEY_NONE, password=''):
         """Retrieve the individual parameters, authenticate the profile
         and initiate the connection to the associated XMPP server.
@@ -352,8 +343,6 @@
 
     def startService(self):
         log.info(u"Salut à toi ô mon frère !")
-        #TODO: manage autoconnect
-        #self.connect()
 
     def stopService(self):
         log.info(u"Salut aussi à Rantanplan")