From: Christian Fetzer <christian.fetzer@bmw-carit.de>
Date: Mon, 9 Sep 2013 16:30:57 +0000 (+0200)
Subject: obexd: Use documented values in org.bluez.obex.Message1 Type property
X-Git-Tag: android-x86-4.4-r3~7627
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=85d61d3e2d97f390e9b8f8d22d94dad30ad3fe22;p=android-x86%2Fexternal-bluetooth-bluez.git

obexd: Use documented values in org.bluez.obex.Message1 Type property

This updates the values that are presented in the Type property to use
the values from the documentation ("email", "sms-gsm", "sms-cdma", "mms").
The existing code directly used the values as received in the messages
listing object ("EMAIL", "SMS_GSM", "SMS_CDMA", "MMS").
---

diff --git a/obexd/client/map.c b/obexd/client/map.c
index f0dcf729c..95f0334ea 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -894,7 +894,17 @@ static void parse_type(struct map_msg *msg, const char *value)
 		return;
 
 	g_free(msg->type);
-	msg->type = g_strdup(value);
+
+	if (strcasecmp(value, "SMS_GSM") == 0)
+		msg->type = g_strdup("sms-gsm");
+	else if (strcasecmp(value, "SMS_CDMA") == 0)
+		msg->type = g_strdup("sms-cdma");
+	else if (strcasecmp(value, "EMAIL") == 0)
+		msg->type = g_strdup("email");
+	else if (strcasecmp(value, "MMS") == 0)
+		msg->type = g_strdup("mms");
+	else
+		msg->type = NULL;
 
 	g_dbus_emit_property_changed(conn, msg->path,
 						MAP_MSG_INTERFACE, "Type");