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

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

Author: jerome
Date: 2009-12-16 12:19:55 +0100 (Wed, 16 Dec 2009)
New Revision: 5990

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
Log:
* Handling the case of Skype client is not installed.

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	2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py	2009-12-16 11:19:55 UTC (rev 5990)
@@ -35,7 +35,7 @@
 import connector
 from communicator import SynchroniousCommands, AsynchroniousCommands
 from errors import EquipmentException, UnavailableContactException, UserNotFindException
-from utils import StringUtils, TuxDroidServerUtils
+from utils import StringUtils, TuxDroidServerUtils, SkypeClient
 
 from IPN.IPNServer import IPNServer
 from IPN.IPNClient import IPNClient
@@ -131,6 +131,14 @@
         Plugin entry point.
         This method should be used to dispatch commands.
         '''
+        #Check if skype is installed.
+        if not SkypeClient.isSkypeClientInstalled():
+            if self.getCommand() != "check":
+                self.throwNotification("start")
+                self.throwMessage("Sorry, it looks like skype is not installed. Please go to the skype website to download the software.")
+                self.throwNotification("stop")
+            self.stop()
+            
         #Init port.
         self.port = TuxDroidServerUtils.getServerPort()
         

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	2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po	2009-12-16 11:19:55 UTC (rev 5990)
@@ -28,3 +28,5 @@
 msgid "{0} is calling you"
 msgstr ""
 
+msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+msgstr "Sorry, Anscheinend ist Skeyepe nicht installiert. Gehen Sie bitte auf die Skype-Website und laden Sie die Software herunter."

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	2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po	2009-12-16 11:19:55 UTC (rev 5990)
@@ -27,3 +27,6 @@
 
 msgid "{0} is calling you"
 msgstr "{0} is calling you"
+
+msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+msgstr "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."

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	2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po	2009-12-16 11:19:55 UTC (rev 5990)
@@ -27,3 +27,6 @@
 
 msgid "{0} is calling you"
 msgstr "{0} vous appelle"
+
+msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+msgstr "Désolé, il semble que skype n'est pas installé. S'il vous plait, rendez vous sur le site internet de skype pour télécharger le logiciel."

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	2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po	2009-12-16 11:19:55 UTC (rev 5990)
@@ -27,3 +27,6 @@
 
 msgid "{0} is calling you"
 msgstr ""
+
+msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+msgstr "Sorry, maar skype is niet geïnstalleerd. Gelieve naar de skype website te gaan en de software te downloaden."

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	2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot	2009-12-16 11:19:55 UTC (rev 5990)
@@ -27,3 +27,6 @@
 
 msgid "{0} is calling you"
 msgstr ""
+
+msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+msgstr ""