2.0_alpha release commit

[framework/messaging/email-service.git] / utilities / test-application / testapp-thread.c

diff --git a/utilities/test-application/testapp-thread.c b/utilities/test-application/testapp-thread.c
index e146506..c035fce 100755 (executable)
--- a/utilities/test-application/testapp-thread.c
+++ b/utilities/test-application/testapp-thread.c
@@ -40,19 +40,20 @@
 static gboolean testapp_test_move_thread()
 {
        int thread_id, move_always_flag;
-       char target_mailbox_name[512];
+       int target_mailbox_id;
        int result;
+       int result_from_scanf = 0;
 
        testapp_print("\n > Enter thread_id: ");
-       scanf("%d", &thread_id);
+       result_from_scanf = scanf("%d", &thread_id);
 
-       testapp_print("\n > Enter target_mailbox_name: ");
-       scanf("%s", target_mailbox_name);
+       testapp_print("\n > Enter target_mailbox_id: ");
+       result_from_scanf = scanf("%d", &target_mailbox_id);
 
        testapp_print("\n > Enter move_always_flag: ");
-       scanf("%d", &move_always_flag);
+       result_from_scanf = scanf("%d", &move_always_flag);
        
-       result = email_move_thread_to_mailbox(thread_id, target_mailbox_name, move_always_flag);
+       result = email_move_thread_to_mailbox(thread_id, target_mailbox_id, move_always_flag);
 
        return FALSE;
 }
@@ -61,12 +62,13 @@ static gboolean testapp_test_delete_thread()
 {
        int thread_id, delete_always_flag;
        int result;
+       int result_from_scanf = 0;
 
        testapp_print("\n > Enter thread_id: ");
-       scanf("%d", &thread_id);
+       result_from_scanf = scanf("%d", &thread_id);
 
        testapp_print("\n > Enter delete_always_flag: ");
-       scanf("%d", &delete_always_flag);
+       result_from_scanf = scanf("%d", &delete_always_flag);
 
        result = email_delete_thread(thread_id, delete_always_flag);
 
@@ -77,15 +79,16 @@ static gboolean testapp_test_set_seen_flag_of_thread()
 {
        int thread_id, seen_flag, on_server;
        int result;
+       int result_from_scanf = 0;
 
        testapp_print("\n > Enter thread_id: ");
-       scanf("%d", &thread_id);
+       result_from_scanf = scanf("%d", &thread_id);
 
        testapp_print("\n > Enter seen_flag: ");
-       scanf("%d", &seen_flag);
+       result_from_scanf = scanf("%d", &seen_flag);
 
        testapp_print("\n > Enter on_server: ");
-       scanf("%d", &on_server);
+       result_from_scanf = scanf("%d", &on_server);
 
        result = email_modify_seen_flag_of_thread(thread_id, seen_flag, on_server);
 
@@ -123,12 +126,13 @@ void testapp_thread_main()
 {
        gboolean go_to_loop = TRUE;
        int menu_number = 0;
+       int result_from_scanf = 0;
 
        while (go_to_loop) {
-               testapp_show_menu (EMF_THREAD_MENU);
-               testapp_show_prompt (EMF_THREAD_MENU);
+               testapp_show_menu (EMAIL_THREAD_MENU);
+               testapp_show_prompt (EMAIL_THREAD_MENU);
 
-               scanf ("%d", &menu_number);
+               result_from_scanf = scanf("%d", &menu_number);
 
                go_to_loop = testapp_test_interpret_command (menu_number);
        }