Fix return key type and max length

Change-Id: I56e3fbef9f549ebac00b471d369c5384a13c427a
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/w-input-keyboard.cpp b/src/w-input-keyboard.cpp
index e504d967b284baae114cff073c8b8b671f5eac46..52a07516d0543d99119f1f1f6cb741bad8820644 100644 (file)
--- a/src/w-input-keyboard.cpp
+++ b/src/w-input-keyboard.cpp
@@ -40,6 +40,7 @@ bool input_keyboard_init(app_control_h app_control)
 
        input_keyboard_deinit();
 
+       // default text
        ret = app_control_get_extra_data(app_control, APP_CONTROL_DATA_INPUT_DEFAULT_TEXT, &default_text);
        if (ret == APP_CONTROL_ERROR_NONE) {
                if (default_text) {
@@ -50,14 +51,20 @@ bool input_keyboard_init(app_control_h app_control)
        free(default_text);
        default_text = NULL;
 
+       // guide text
        ret = app_control_get_extra_data(app_control, APP_CONTROL_DATA_INPUT_GUIDE_TEXT, &guide_text);
        if (ret == APP_CONTROL_ERROR_NONE) {
                if (guide_text) {
                        g_input_keyboard_data.guide_text = string(guide_text);
-                       free(guide_text);
+
                }
        }
-       ret = app_control_get_extra_data(app_control, "return_key_type", &return_key_type);
+
+       free(guide_text);
+       guide_text = NULL;
+
+       // return key type
+       ret = app_control_get_extra_data(app_control, APP_CONTROL_DATA_INPUT_RETURNKEY_TYPE, &return_key_type);
        if (ret == APP_CONTROL_ERROR_NONE) {
                if (return_key_type) {
                        g_input_keyboard_data.return_key_type = string(return_key_type);
@@ -67,7 +74,8 @@ bool input_keyboard_init(app_control_h app_control)
        free(return_key_type);
        return_key_type = NULL;
 
-       ret = app_control_get_extra_data(app_control, "max_text_length", &max_text_length);
+       // max text length
+       ret = app_control_get_extra_data(app_control, APP_CONTROL_DATA_INPUT_MAX_TEXT_LENGTH, &max_text_length);
        if (ret == APP_CONTROL_ERROR_NONE) {
                if (max_text_length) {
                        g_input_keyboard_data.max_text_length = atoi(max_text_length);
@@ -77,7 +85,8 @@ bool input_keyboard_init(app_control_h app_control)
        free(max_text_length);
        max_text_length = NULL;
 
-       ret = app_control_get_extra_data(app_control, "cursor_position_set", &cursor_position_set);
+       // cursor position set
+       ret = app_control_get_extra_data(app_control, APP_CONTROL_DATA_INPUT_CURSOR_POSITION_SET, &cursor_position_set);
        if (ret == APP_CONTROL_ERROR_NONE) {
                if (cursor_position_set) {
                        g_input_keyboard_data.cursor_position_set = atoi(cursor_position_set);