Author: remi
Date: 2009-03-13 11:51:15 +0100 (Fri, 13 Mar 2009)
New Revision: 4049

Modified:
   
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
Log:
* fixed gadget notification encoding
* fixed index error in the notification callback

Modified: 
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
===================================================================
--- 
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
 2009-03-13 10:35:59 UTC (rev 4048)
+++ 
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
 2009-03-13 10:51:15 UTC (rev 4049)
@@ -112,8 +112,9 @@
             if len(result) == 0:
                 result = []
             else:
-                u = unicode(result, "iso-8859-1")
-                result = u.encode("utf-8", "replace")
+                if os.name == 'nt':
+                    u = unicode(result, "iso-8859-1")
+                    result = u.encode("utf-8", "replace")
                 if result[-1] == "\r":
                     result = result[:-1]
                 result = result.split("|")
@@ -231,7 +232,7 @@
                     args[2:])
                 if self.__onGadgetNotificationCallback != None:
                     self.__onGadgetNotificationCallback(args[2], args[3],
-                        args[4], args[5], args[5], args[6:])
+                        args[4], args[5], args[6], args[7:])
             elif args[1] == "STARTING":
                 self.__publishEvents(True, ST_NAME_FW_GADGET_STARTING, 
args[2:])
                 if self.__onGadgetStartingCallback != None:


------------------------------------------------------------------------------
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

Reply via email to