ndef: Simplify D-Bus exported record type strings
authorSamuel Ortiz <sameo@linux.intel.com>
Thu, 17 Oct 2013 23:00:25 +0000 (01:00 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Thu, 17 Oct 2013 23:07:34 +0000 (01:07 +0200)
"Android Application Record (AAR)" is not really D-Bus clients
friendly.

doc/tag-api.txt
src/ndef.c

index 9e06d7e..2fbde60 100644 (file)
@@ -86,7 +86,9 @@ Properties    string Type [readonly]
                        The NDEF record type name.
 
                        Possible values are "SmartPoster", "Text", "URI",
-                       "HandoverRequest", "HandoverSelect", "HandoverCarrier".
+                       "HandoverRequest", "HandoverSelect", "HandoverCarrier",
+                       "AAR" for Android Application Record and "MIMEType" for
+                       RFC 2046 MIME types.
 
                string Encoding [readonly]
 
index af2b883..5c241c8 100644 (file)
@@ -488,14 +488,14 @@ static void append_record(struct near_ndef_record *record,
                break;
 
        case RECORD_TYPE_MIME_TYPE:
-               type = "MIME Type (RFC 2046)";
+               type = "MIMEType";
                near_dbus_dict_append_basic(dict, "Type",
                                        DBUS_TYPE_STRING, &type);
                append_mime_payload(record->mime, dict);
                break;
 
        case RECORD_TYPE_EXT_AAR:
-               type = "Android Application Record (AAR)";
+               type = "AAR";
                near_dbus_dict_append_basic(dict, "Type",
                                        DBUS_TYPE_STRING, &type);
                append_aar_payload(record->aar, dict);