Fix issue uninitialized pointer was used

[platform/core/uifw/inputdelegator.git] / src / w-input-selector.cpp

diff --git a/src/w-input-selector.cpp b/src/w-input-selector.cpp
index f08b774..cc1d389 100755 (executable)
--- a/src/w-input-selector.cpp
+++ b/src/w-input-selector.cpp
@@ -20,7 +20,6 @@
 #include <dlog.h>
 #include <Eina.h>
 #include <string>
-#include <efl_assist.h>
 #include <vconf.h>
 #include <vconf-keys.h>
 
@@ -109,9 +108,9 @@ void init_customizing_theme(void)
 
 static Eina_Bool back_cb(void *data, Elm_Object_Item *it)
 {
-    reply_to_sender_by_callback_for_back();
-    elm_exit();
-    return EINA_FALSE;
+       reply_to_sender_by_callback_for_back();
+       ui_app_exit();
+       return EINA_FALSE;
 }
 
 static void _stt_clicked_cb(void *data, Evas_Object * obj, void *event_info)
@@ -148,8 +147,7 @@ static void _emoticon_clicked_cb(void *data, Evas_Object * obj, void *event_info
        if(!ad)
                return;
 
-//     ise_show_emoticon_popup(ad);
-       ise_show_emoticon_popup_rotary(ad);
+    ise_show_emoticon_list(ad);
 }
 
 static void _keyboard_clicked_cb(void *data, Evas_Object * obj, void *event_info)
@@ -164,26 +162,6 @@ static void _keyboard_clicked_cb(void *data, Evas_Object * obj, void *event_info
        input_keyboard_launch(ad->win_main, data);
 }
 
-static void __bt_connection_result_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *user_data)
-{
-       char *val = NULL;
-
-       if (reply == NULL) {
-               PRINTFUNC(DLOG_ERROR, "service_h is NULL");
-               return;
-       }
-
-       app_control_get_extra_data(reply, "__BT_CONNECTION__", &val);
-       if (val) {
-               if ( strcmp(val, "Connected") == 0 ) {
-                       PRINTFUNC(DLOG_ERROR, "BT Connected");
-               } else {
-                       PRINTFUNC(DLOG_ERROR, "BT Not Connected");
-               }
-               free(val);
-       }
-}
-
 static Evas_Object * __ise_gl_2button_content_get(void *data, Evas_Object *obj, const char *part)
 {
        char *first_input_type = *(g_input_type_data.input_type_array + 0);
@@ -198,13 +176,15 @@ static Evas_Object * __ise_gl_2button_content_get(void *data, Evas_Object *obj,
                elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE);
                string path = get_resource_path();
                if (!strcmp(part, "elm.icon.1")) {
-                       elm_object_style_set(btn, "anchor");
                        string path_ic;
                        if(!strcmp(first_input_type, "input_voice")) {
+                               elm_object_style_set(btn, "ime_button_stt");
                                path_ic = path + "images/w_mode_stt_ic.png";
                        } else if (!strcmp(first_input_type, "input_emoticon")) {
+                               elm_object_style_set(btn, "ime_button_emoticon");
                                path_ic = path + "images/Delta_w_mode_emoticon_ic.png";
                        } else if (!strcmp(first_input_type, "input_keyboard")) {
+                               elm_object_style_set(btn, "ime_button_keyboard");
                                path_ic = path + "images/w_mode_keyboard_ic.png";
                                evas_object_propagate_events_set(btn, EINA_FALSE);
                        }
@@ -212,13 +192,15 @@ static Evas_Object * __ise_gl_2button_content_get(void *data, Evas_Object *obj,
                        elm_object_content_set(btn, ic);
                        evas_object_layer_set(btn, 32000);
                } else if (!strcmp(part, "elm.icon.2")){
-                       elm_object_style_set(btn, "anchor");
                        string path_ic;
                        if(!strcmp(second_input_type, "input_voice")) {
+                               elm_object_style_set(btn, "ime_button_stt");
                                path_ic = path + "images/w_mode_stt_ic.png";
                        } else if (!strcmp(second_input_type, "input_emoticon")) {
+                               elm_object_style_set(btn, "ime_button_emoticon");
                                path_ic = path + "images/Delta_w_mode_emoticon_ic.png";
                        } else if (!strcmp(second_input_type, "input_keyboard")) {
+                               elm_object_style_set(btn, "ime_button_keyboard");
                                path_ic = path + "images/w_mode_keyboard_ic.png";
                                evas_object_propagate_events_set(btn, EINA_FALSE);
                        }
@@ -273,21 +255,21 @@ static Evas_Object * __ise_gl_3button_content_get(void *data, Evas_Object *obj,
                elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE);
                string path = get_resource_path();
                if (!strcmp(part, "elm.icon.1")) {
-                       elm_object_style_set(btn, "anchor");
+                       elm_object_style_set(btn, "ime_button_stt");
                        string path_ic = path + "images/w_mode_stt_ic.png";
                        elm_image_file_set(ic, path_ic.c_str(), NULL);
                        elm_object_content_set(btn, ic);
                        evas_object_layer_set(btn, 32000);
 
                } else if (!strcmp(part, "elm.icon.2")){
-                       elm_object_style_set(btn, "anchor");
+                       elm_object_style_set(btn, "ime_button_emoticon");
                        string path_ic = path + "images/Delta_w_mode_emoticon_ic.png";
                        elm_image_file_set(ic, path_ic.c_str(), NULL);
                        elm_object_content_set(btn, ic);
                        evas_object_layer_set(btn, 32000);
 
                } else if (!strcmp(part, "elm.icon.3")){
-                       elm_object_style_set(btn, "anchor");
+                       elm_object_style_set(btn, "ime_button_keyboard");
                        string path_ic = path + "images/w_mode_keyboard_ic.png";
                        elm_image_file_set(ic, path_ic.c_str(), NULL);
                        elm_object_content_set(btn, ic);
@@ -483,7 +465,7 @@ void _back_to_genlist_for_selector()
        if(app_data->app_type == APP_TYPE_STT || app_data->app_type == APP_TYPE_EMOTICON){
                PRINTFUNC(DLOG_DEBUG, "launched as STT/EMOTICON mode, So exit here.");
                reply_to_sender_by_callback(NULL, NULL);
-               elm_exit();
+               ui_app_exit();
        }
 
        Evas_Object *circle_genlist = (Evas_Object *) evas_object_data_get(app_data->genlist, "circle");
@@ -595,13 +577,13 @@ void _create_genlist_items(void* user_data)
 
        Elm_Genlist_Item_Class * itc1 = elm_genlist_item_class_new();
        if(g_input_type_data.input_type_array_len == 2){
-               itc1->item_style = "2button";
+               itc1->item_style = "2button_flat";
                itc1->func.text_get = NULL;
                itc1->func.content_get = __ise_gl_2button_content_get;
                itc1->func.state_get = NULL;
                itc1->func.del = NULL;
        } else {
-               itc1->item_style = "3button";
+               itc1->item_style = "3button_flat";
                itc1->func.text_get = NULL;
                itc1->func.content_get = __ise_gl_3button_content_get;
                itc1->func.state_get = NULL;
@@ -639,7 +621,7 @@ bool _app_create(void* user_data)
        Evas_Object* conform = NULL;
        Evas_Object* bg = NULL;
        Evas_Object* window = NULL;
-       Eext_Circle_Surface *surface;
+       Eext_Circle_Surface *surface = NULL;
 
        if (!user_data) {
                return false;
@@ -842,7 +824,7 @@ void input_type_deinit(void)
        g_input_type_data.input_type_array_len = 0;
 }
 
-int main(int argc, char* argv[])
+EXPORTED int main(int argc, char* argv[])
 {
        App_Data app_data = {0, };
        ui_app_lifecycle_callback_s event_callback = {0, };