r4147 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src/phone-kit

[chris at sita.openmoko.org]

Author: chris
Date: 2008-03-03 11:58:03 +0100 (Mon, 03 Mar 2008)
New Revision: 4147

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
Log:
        * src/phone-kit/moko-sms.c: (on_incoming_sms):
        Move g_utf16_to_utf8 outside of the for loop - error inserted by
        myself while integrating previous patch


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-03-03 08:03:54 UTC (rev 4146)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-03-03 10:58:03 UTC (rev 4147)
@@ -1,3 +1,9 @@
+2008-03-03  Chris Lord  <chris at openedhand.com>
+
+	* src/phone-kit/moko-sms.c: (on_incoming_sms):
+	Move g_utf16_to_utf8 outside of the for loop - error inserted by
+	myself while integrating previous patch
+
 2008-02-29  Chris Lord  <chris at openedhand.com>
 
 	* src/phone-kit/moko-sms.c: (on_incoming_sms):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c	2008-03-03 08:03:54 UTC (rev 4146)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c	2008-03-03 10:58:03 UTC (rev 4147)
@@ -300,17 +300,16 @@
   case ALPHABET_UCS2 :
     {
       gint i;
-      gunichar2 *ucs2 = sms->payload.data;
+      gunichar2 *ucs2 = (gunichar2 *)sms->payload.data;
 
       g_debug ("Decoding UCS-2 message");
 
-      for (i = 0; i < sms->payload.length / 2; i++) {
+      for (i = 0; i < sms->payload.length / 2; i++)
         ucs2[i] = GUINT16_FROM_BE(ucs2[i]);
 
-        message = g_utf16_to_utf8 ((const gunichar2 *)sms->payload.data,
-                                   sms->payload.length, NULL, NULL, NULL);
-      }
-
+      message = g_utf16_to_utf8 (ucs2,
+                                 sms->payload.length, NULL, NULL, NULL);
+      
       break;
     }
   }