demo: replace new line character with carriage return

Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/capi/demo/comp-manager.c b/capi/demo/comp-manager.c
index dec77d5baf3b83a85afaf02261b36fdc66ca82d4..0b9e9885000d158e752290b123bc71c033762f84 100644 (file)
--- a/capi/demo/comp-manager.c
+++ b/capi/demo/comp-manager.c
@@ -33,7 +33,7 @@ GList *my_devices_list;
 
 static char groupid[MENU_DATA_SIZE + 1] = "mygroup";
 static char request_groupid[MENU_DATA_SIZE + 1] = "subgroup";
-static char timeout[MENU_DATA_SIZE + 1] = "7";
+static char timeout[MENU_DATA_SIZE + 1] = "2";
 static char group_idx[MENU_DATA_SIZE + 1] = "1";
 static char group_idx_a[MENU_DATA_SIZE + 1] = "1";
 static char group_idx_b[MENU_DATA_SIZE + 1] = "2";
@@ -95,8 +95,7 @@ int run_get_my_id(MManager *mm, struct menu_data *menu)
 
 void _device_eject_result_cb(int result, void *user_data)
 {
-       msg("");
-       msgb("Eject Device Complete [%s]", comp_error_to_string(result) );
+       msgb("\rEject Device Complete [%s]", comp_error_to_string(result) );
 }
 
 static int run_device_eject(MManager *mm, struct menu_data *menu)
@@ -155,8 +154,7 @@ static int run_device_eject(MManager *mm, struct menu_data *menu)
 
 void _device_invite_result_cb(int result, void *user_data)
 {
-       msg("");
-       msgb("Invite Device Finished [%s]", comp_error_to_string(result) );
+       msgb("\rInvite Device Finished [%s]", comp_error_to_string(result) );
 }
 
 static int run_device_invite(MManager *mm, struct menu_data *menu)
@@ -407,8 +405,6 @@ int run_device_show_found(MManager *mm, struct menu_data *menu)
        int count;
        companion_device_h *devices = NULL;
 
-       msg("");
-
        ret = companion_device_get_found_devices(&devices, &count);
        if (COMP_ERROR_NONE != ret) {
                msgr("Failed to Get Found Devices: [%s(0x%X)]", comp_error_to_string(ret), ret);
@@ -440,7 +436,7 @@ int run_device_show_found(MManager *mm, struct menu_data *menu)
 
 void _device_finish_cb(int result, void *user_data)
 {
-       msgb("Find Device Finished ret: [0x%X] [%s]", result, comp_error_to_string(result));
+       msgb("\rFind Device Finished ret: [0x%X] [%s]", result, comp_error_to_string(result));
 }
 
 bool _device_found_cb(companion_device_h device, void *user_data)
@@ -453,7 +449,7 @@ bool _device_found_cb(companion_device_h device, void *user_data)
        companion_device_information_get_ip(device, &ip);
        companion_device_information_get_device_type(device, &device_type);
 
-       msgp("\n[ID] %s [IP] %s [Ver] %s", device_id, ip, device_type);
+       msgp("\r[ID] %s [IP] %s [Ver] %s", device_id, ip, device_type);
 
        if (device_id)
                free(device_id);
@@ -534,7 +530,7 @@ int run_device_show_my_device(MManager *mm, struct menu_data *menu)
 
 static void _group_leave_finish_cb(int result, void *user_data)
 {
-    msgb("leave operation finished");
+       msgb("\rleave operation finished");
 }
 
 static int run_group_leave(MManager *mm, struct menu_data *menu)
@@ -612,7 +608,7 @@ static int run_group_show(MManager *mm, struct menu_data *menu)
 
 static void _group_join_finish_cb(int result, void *user_data)
 {
-       msgp("join operation finished");
+       msgp("\rjoin operation finished");
 }
 
 static int run_group_join(MManager *mm, struct menu_data *menu)
@@ -703,13 +699,10 @@ bool _group_found_cb(companion_group_type_e type, companion_group_h group, void
 
        companion_group_information_get_name(group, &group_name);
 
-       msg("");
-
-
        if (type == COMPANION_GROUP_TYPE_MINE)
-               msgp("found group type : MINE, name : %s", group_name);
+               msgp("\rfound group type : MINE, name : %s", group_name);
        else
-               msgp("found group type : REMOTE, name : %s", group_name);
+               msgp("\rfound group type : REMOTE, name : %s", group_name);
 
        found_group_list = g_list_append(found_group_list, group);
 
@@ -718,7 +711,7 @@ bool _group_found_cb(companion_group_type_e type, companion_group_h group, void
 
 void _group_finish_cb(int result, void *user_data)
 {
-       msgb("Find Group Finished ret: [0x%X] [%s]", result, comp_error_to_string(result));
+       msgb("\rFind Group Finished ret: [0x%X] [%s]", result, comp_error_to_string(result));
 }
 
 static int run_group_find(MManager *mm, struct menu_data *menu)
@@ -763,9 +756,9 @@ static int run_group_create(MManager *mm, struct menu_data *menu)
 
 void _send_data_finish_cb(int result, char *resp_data, void *user_data)
 {
-       msgb("Find Send Data Finished = %d", result);
+       msgb("\rFind Send Data Finished = %d", result);
        if (resp_data != NULL && strlen(resp_data) > 0) {
-               msgp("Response Data = %s", resp_data);
+               msgp("Response from %s", resp_data);
        }
 }
 
@@ -786,7 +779,7 @@ static int __send_data(int idx)
 
        companion_device_information_get_device_id(device, &deviceid);
        companion_device_information_get_ip(device, &address);
-       msgb("Send Data: [ID] %s [IP] %s", deviceid, address);
+       msgb("Sent to [ID] %s [IP] %s", deviceid, address);
        if (deviceid) {
                free(deviceid);
                deviceid= NULL;
@@ -843,7 +836,7 @@ static int run_send_data_all(MManager *mm, struct menu_data *menu)
 
 void _mowned_device_finish_cb(int result, void *user_data)
 {
-       msgb("Find My Owned Devices Finished ret: [0x%X] [%s]", result, comp_error_to_string(result));
+       msgb("\rFind My Owned Devices Finished ret: [0x%X] [%s]", result, comp_error_to_string(result));
 }
 
 bool _mowned_device_found_cb(companion_device_h device, void *user_data)
@@ -856,7 +849,7 @@ bool _mowned_device_found_cb(companion_device_h device, void *user_data)
        companion_device_information_get_ip(device, &ip);
        companion_device_information_get_device_type(device, &device_type);
 
-       msgb("\n[ID] %s [IP] %s [Ver] %s", device_id, ip, device_type);
+       msgb("\r[ID] %s [IP] %s [Ver] %s", device_id, ip, device_type);
 
        if (device_id)
                free(device_id);
@@ -900,8 +893,6 @@ int run_device_show_mowned_device(MManager *mm, struct menu_data *menu)
        int count;
        companion_device_h *devices = NULL;
 
-       msg("");
-
        ret = companion_device_get_found_mowned_devices(&devices, &count);
        if (COMP_ERROR_NONE != ret) {
                msgr("Failed to Get Found Mowned Devices: [%s(0x%X)]", comp_error_to_string(ret), ret);