[tuxdroid-svn] r6032 - software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables

[jerome <c2m...@c2...>]

Author: jerome
Date: 2010-01-05 10:35:47 +0100 (Tue, 05 Jan 2010)
New Revision: 6032

Modified:
   software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py
Log:
* Skype client auto start removed.

Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py	2010-01-05 09:25:14 UTC (rev 6031)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py	2010-01-05 09:35:47 UTC (rev 6032)
@@ -125,7 +125,6 @@
     initialized = False
     isIncoming = False
     isOutgoingUser = True 
-    clientStartedByPlugin = False
     
     
     ##----------------------------------------------------------------
@@ -452,10 +451,6 @@
         '''
         Outgoing call finished callback.
         '''
-        #Stop Skype client if it was started by the plugin.
-        if self.clientStartedByPlugin:
-            self.connectorObj.stopClient()
-            self.clientStartedByPlugin = False
         #Send reset switches signal.
         self.serv.notify(END)
     
@@ -503,9 +498,6 @@
             return
             
         if self.onlineList[self.currentContact] == 'Quit gadget':
-            if self.clientStartedByPlugin:
-                self.connectorObj.stopClient()
-                self.clientStartedByPlugin = False
             self.serv.notify(END)
         else:
             self.synchronious.call(self.onlineList[self.currentContact])
@@ -568,13 +560,10 @@
         
         elif self.isOutgoingUser:
             if not self.connectorObj.isClientRunning():
-                self.clientStartedByPlugin = True
-                thread = threading.Thread(target=self.connectorObj.startClient)
-                thread.start()
-                   
-                self.serv.notify(COMMAND_TTS + "Please, login to your Skype account or push my head button to quit gadget")
-                self.OnSkypeStarted()
-                
+                self.serv.notify(COMMAND_TTS + "Please, login to your Skype account.")
+                #Wait tts ends.
+                time.sleep(5.0)
+                self.serv.notify(END)
             if self.initialized:
                 #Then interface outgoing call.
                 self.serv.notify(COMMAND_OUTGOING_USER)
@@ -653,13 +642,6 @@
             #Reset values.            
             self.isIncoming = False
             self.isOutgoingUser = True  
-            #Quit Skype client if started bu outgoing plugin.
-            try:
-                if self.clientStartedByPlugin:
-                    self.connectorObj.stopClient()
-                    self.clientStartedByPlugin = False
-            except:
-                pass