Author: jerome
Date: 2009-03-12 17:02:25 +0100 (Thu, 12 Mar 2009)
New Revision: 4021
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/executables/tuxdroid-gadget-skype.py
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.pot
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.xml
Log:
* Forget to add the start skype appl function for windblows...
* Removed a parameter to set it as default ( start skype if client isn't
started ).
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/executables/tuxdroid-gadget-skype.py
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/executables/tuxdroid-gadget-skype.py
2009-03-12 15:55:24 UTC (rev 4020)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/executables/tuxdroid-gadget-skype.py
2009-03-12 16:02:25 UTC (rev 4021)
@@ -65,11 +65,8 @@
speaker = "Ryan"
pitch = 120
ip = "127.0.0.1"
- startSkype = True
#Geting right gadget parameters.
- if "tgp_startSkype" in os.environ:
- startSkype = os.environ["tgp_startSkype"]
if "tgp_ip" in os.environ:
ip = os.environ["tgp_ip"]
if "tgp_locutor" in os.environ:
@@ -103,11 +100,7 @@
try:
#Get skype aplication state
if not self.__getSkypeConnected():
-
- if self.startSkype:
- self.__startSkype()
-
- time.sleep(1)
+ self.__startSkype()
t = threading.Thread(target = self.__start, args = [])
t.start()
return
@@ -292,12 +285,16 @@
#Return if skype is already started.
if self.__getSkypeConnected():
return
-
- cmd = ["skype", ]
- subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+
+ if self.isWindows():
+ if "ProgramFiles" in os.environ:
+ subprocess.Popen(os.environ["ProgramFiles"] +
"\\Skype\\Phone\\Skype.exe", stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+ else:
+ cmd = ["skype", ]
+ subprocess.Popen(cmd, stdin=subprocess.PIPE,
stdout=subprocess.PIPE)
+
-
def __getConnected(self):
'''
Return true if connected.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.pot
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.pot
2009-03-12 15:55:24 UTC (rev 4020)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.pot
2009-03-12 16:02:25 UTC (rev 4021)
@@ -4,9 +4,6 @@
msgid "Tux takes control of skype"
msgstr ""
-msgid "Start skype with the gadget"
-msgstr ""
-
msgid "connecting"
msgstr ""
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.xml
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.xml
2009-03-12 15:55:24 UTC (rev 4020)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.xml
2009-03-12 16:02:25 UTC (rev 4021)
@@ -12,15 +12,6 @@
<executionMode>command</executionMode>
<uuid>8349ed52-572d-4c3f-a7b8-f6d4a5ae2c0</uuid>
</description>
- <parameters>
- <parameter
- category="User parameters"
- name="startSkype"
- description="Start skype with the gadget"
- type="boolean"
- defaultValue="false"
- />
- </parameters>
<commands>
<commands
name="run"
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
