[tuxdroid-svn] r5584 - software_suite_v3/software/plugin/plugin-skype/trunk/executables

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

Author: jerome
Date: 2009-10-01 16:54:23 +0200 (Thu, 01 Oct 2009)
New Revision: 5584

Modified:
   software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
Log:
* Quit Skype client before quitting the gadget if it was started by plugin.

Modified: software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-10-01 13:26:08 UTC (rev 5583)
+++ software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-10-01 14:54:23 UTC (rev 5584)
@@ -89,6 +89,7 @@
         # Skype process
         self.attemptTimeout = 0
         self.normalStart = False
+        self.quitSkypeClient = False
         self.count = 1
 
     def start(self):
@@ -141,6 +142,12 @@
                     self.__skype.Client.Shutdown()
                 refreshTaskBar()
         try:
+        
+            #Sending 'Shutdown command' first to do not block the quit process that is quite long.
+            if self.quitSkypeClient:
+                self.__skype.Client.Shutdown()
+                time.sleep(1.0)
+                
             if self.__skype != None:
                 self.hangUp()
                 if self.__skype.Client.IsRunning:
@@ -415,6 +422,7 @@
         if self.__getSkypeAppConnected():
             self.normalStart = True
             return
+        self.quitSkypeClient = True
         self.throwMessage("Please wait while I launch the skeyepe application") 
         self.__skype.Client.Start(Minimized=False, Nosplash=True)