Remove platform info uri path accepted/tizen/mobile/20160106.122410 accepted/tizen/tv/20160106.122428 accepted/tizen/wearable/20160106.122443 submit/tizen/20160106.081621
authoryoungman <yman.jung@samsung.com>
Wed, 6 Jan 2016 00:52:32 +0000 (09:52 +0900)
committerYoungjae Shin <yj99.shin@samsung.com>
Wed, 6 Jan 2016 08:14:52 +0000 (17:14 +0900)
Change-Id: If399afafb99b409e7170dec70d85d7901a55565e
Signed-off-by: youngman <yman.jung@samsung.com>
daemon/icd-payload.c
lib/icl-device.c

index 7c0cd2c..25aac6e 100644 (file)
@@ -336,8 +336,7 @@ static GVariant* _icd_payload_platform_to_gvariant(OCPlatformPayload *repr)
 {
        GVariant *value;
 
-       value = g_variant_new("(ssssssssssss)",
-                       repr->uri,
+       value = g_variant_new("(sssssssssss)",
                        repr->info.platformID,
                        repr->info.manufacturerName,
                        ic_utils_dbus_encode_str(repr->info.manufacturerUrl),
index 51cd43c..f024ea1 100644 (file)
@@ -259,15 +259,13 @@ static void _icl_platform_info_cb(GDBusConnection *connection,
                GVariant *parameters,
                gpointer user_data)
 {
-       char *uri_path;
        struct icl_platform_info info = {0};
        icl_platform_info_s *cb_container = user_data;
        iotcon_platform_info_cb cb = cb_container->cb;
 
        cb_container->found = true;
 
-       g_variant_get(parameters, "(&s&s&s&s&s&s&s&s&s&s&s&s)",
-                       &uri_path,
+       g_variant_get(parameters, "(&s&s&s&s&s&s&s&s&s&s&s)",
                        &info.platform_id,
                        &info.manuf_name,
                        &info.manuf_url,
@@ -290,8 +288,6 @@ static void _icl_platform_info_cb(GDBusConnection *connection,
        info.support_url = ic_utils_dbus_decode_str(info.support_url);
        info.system_time = ic_utils_dbus_decode_str(info.system_time);
 
-       /* From iotivity, we can get uri_path. But, the value is always "/oic/p". */
-
        if (cb)
                cb(&info, IOTCON_ERROR_NONE, cb_container->user_data);
 }