[tuxdroid-svn] r6034 - in software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin: executables resources

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

Author: jerome
Date: 2010-01-05 13:24:59 +0100 (Tue, 05 Jan 2010)
New Revision: 6034

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/resources/de.po
   software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
   software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
   software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
   software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot
   software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml
Log:
* Fixed po files.
* Start the daemon if notifier gadget is not in alerts list and user make use of skype outgoing. 

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 10:02:36 UTC (rev 6033)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py	2010-01-05 12:24:59 UTC (rev 6034)
@@ -168,6 +168,7 @@
             if self.getCommand() == 'check':
                 self.serv.stop()
             if self.getCommand() == 'run': 
+                
                 self.throwNotification("start")
                 self.throwActuation("downFlippers")
                 self.throwActuation("closeMouth")
@@ -187,9 +188,21 @@
         '''
         self.client = IPNClient('127.0.0.1', 48536)
         self.client.registerOnNotificationCallBack(self.ClientOnNotification)
-        self.client.start()
+        connected = self.client.start()
+        
+        if not connected:
+            #IPN server not started, so the daemon plugin is not started.
+            request = '/plugins_server/start_plugin?command=check&uuid='+ self.uuid +'&parameters='
+            thread = threading.Thread(target=TuxDroidServerUtils.sendRequest, args=("127.0.0.1", self.port, request))
+            thread.start()
+            time.sleep(1.0)
+            
+            while 1:
+                if self.client.start():
+                    break
+                time.sleep(1.0)
+        
     
-    
     def stopTTS(self):
         '''Stop the tts.
         '''
@@ -553,6 +566,7 @@
         '''
         Server IPN callback when IPN client is added.
         '''
+        self.throwTrace("client added")
         #First action, sending command to the plugin client.
         if self.isIncoming:
             #Then it's an incoming call.
@@ -564,9 +578,14 @@
                 #Wait tts ends.
                 time.sleep(5.0)
                 self.serv.notify(END)
-            if self.initialized:
-                #Then interface outgoing call.
-                self.serv.notify(COMMAND_OUTGOING_USER)
+            
+            #Waiting for daemon initialization.
+            if not self.initialized:
+                while not self.initialized:
+                    time.sleep(1.0)
+                    
+            #Then interface outgoing call.
+            self.serv.notify(COMMAND_OUTGOING_USER)
         
         else:
             #Then user uses TuxBox to make a call. 

Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po	2010-01-05 10:02:36 UTC (rev 6033)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po	2010-01-05 12:24:59 UTC (rev 6034)
@@ -33,7 +33,8 @@
 
 msgid "Quit gadget"
 msgstr "Beenden die Kadchet."
-msgid "Please, login to your Skype account or push my head button to quit gadget"
+
+msgid "Please, login to your Skype account."
 msgstr ""
 
 msgid "There had a problem with Skype Client, please, try later again."

Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po	2010-01-05 10:02:36 UTC (rev 6033)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po	2010-01-05 12:24:59 UTC (rev 6034)
@@ -34,8 +34,8 @@
 msgid "Quit gadget"
 msgstr "Quit gadget"
 
-msgid "Please, login to your Skype account or push my head button to quit gadget"
-msgstr "Please, login to your Skype account or push my head button to quit gadget"
+msgid "Please, login to your Skype account."
+msgstr "Please, login to your Skype account."
 
 msgid "There had a problem with Skype Client, please, try later again."
 msgstr "There had a problem with Skype Client, please, try later again."

Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po	2010-01-05 10:02:36 UTC (rev 6033)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po	2010-01-05 12:24:59 UTC (rev 6034)
@@ -34,8 +34,8 @@
 msgid "Quit gadget"
 msgstr "Quitter le gadget"
 
-msgid "Please, login to your Skype account or push my head button to quit gadget"
-msgstr "S'il vou plait, connectez vous à votre compte Skype ou appyez sur mon bouton de tête pour quitter le gadget"
+msgid "Please, login to your Skype account."
+msgstr "S'il vous plait, connectez vous à votre compte Skype."
 
 msgid "There had a problem with Skype Client, please, try later again."
 msgstr "Il y a eu un problème avec le client Skype, s'il vous plait, essayez plus tard."

Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po	2010-01-05 10:02:36 UTC (rev 6033)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po	2010-01-05 12:24:59 UTC (rev 6034)
@@ -34,7 +34,7 @@
 msgid "Quit gadget"
 msgstr "Gadget afsluiten"
 
-msgid "Please, login to your Skype account or push my head button to quit gadget"
+msgid "Please, login to your Skype account."
 msgstr ""
 
 msgid "There had a problem with Skype Client, please, try later again."

Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot	2010-01-05 10:02:36 UTC (rev 6033)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot	2010-01-05 12:24:59 UTC (rev 6034)
@@ -34,7 +34,7 @@
 msgid "Quit gadget"
 msgstr ""
 
-msgid "Please, login to your Skype account or push my head button to quit gadget"
+msgid "Please, login to your Skype account."
 msgstr ""
 
 msgid "There had a problem with Skype Client, please, try later again."

Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml	2010-01-05 10:02:36 UTC (rev 6033)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml	2010-01-05 12:24:59 UTC (rev 6034)
@@ -19,12 +19,12 @@
             name="throwEmoticons"
             description="Notify incoming Emoticons"
             type="boolean"
-            defaultValue="true" />
+            defaultValue="false" />
         <parameter
             name="throwTTS"
             description="Notify incoming TTS messages"
             type="boolean"
-            defaultValue="true" />    
+            defaultValue="false" />    
 	</parameters>
 	<commands>
         <command