Fix build warning

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

diff --git a/src/w-input-emoticon.cpp b/src/w-input-emoticon.cpp
index ea1140a..2a19150 100755 (executable)
--- a/src/w-input-emoticon.cpp
+++ b/src/w-input-emoticon.cpp
@@ -280,7 +280,7 @@ static Eina_Bool _custom_back_cb2(void *data, Elm_Object_Item *it)
             lazy_loading_timer_for_contents = NULL;
         }
 
-        if(emoticon_drawing_pool.used == 0){
+        if (emoticon_drawing_pool.used == 0){
             evas_object_del(emoticon_drawing_pool.content);
         }
         emoticon_drawing_pool.content = NULL;
@@ -368,7 +368,6 @@ void set_recent_emoticons(vector <int> &emoticon_list, int val)
     if (PREFERENCE_ERROR_NONE != ret) {
         PRINTFUNC(DLOG_ERROR, "preference_set_string error!(%d)", ret);
     }
-
 }
 
 static void _drawing_app_control_reply_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *user_data)
@@ -376,10 +375,10 @@ static void _drawing_app_control_reply_cb(app_control_h request, app_control_h r
     char* path = NULL;
     app_control_get_extra_data(reply, APP_CONTROL_DATA_PATH, &path);
 
-    if(path){
+    if (path){
         PRINTFUNC(DLOG_DEBUG, "path=%s", path);
         char *pathes[] = {path, };
-        reply_to_sender_by_callback(NULL, "image", (const char **)pathes);
+        reply_to_sender_by_callback(NULL, "image", (const char **)pathes, NULL);
         free(path);
     }
     ui_app_exit();
@@ -421,7 +420,7 @@ static void _emoticon_item_clicked_cb(void *data, Evas_Object * obj, void *event
     const Eina_Unicode unicode_event[2] = { (Eina_Unicode)emoticon_info[index].code, 0 };
     char* utf_8 = eina_unicode_unicode_to_utf8(unicode_event, &length);
 
-    reply_to_sender_by_callback((const char*)utf_8, "emoticon", NULL);
+    reply_to_sender_by_callback((const char*)utf_8, "emoticon", NULL, NULL);
 
     PRINTFUNC(SECURE_DEBUG, "[%d]%s", index, utf_8);
     if (utf_8)
@@ -566,7 +565,7 @@ static Evas_Object * __emoticon_gl_1_content_get(void *data, Evas_Object *obj, c
         emoticon_drawing_pool.content = btn;
         emoticon_drawing_pool.used = 0;
         return btn;
-    } else if(!strcmp(part, "base")){
+    } else if (!strcmp(part, "base")){
         Evas_Object* btn = elm_button_add(obj);
         elm_object_style_set(btn, "ime/transparent");
         return btn;
@@ -883,12 +882,15 @@ void _update_emoticon_items(void *data)
     itc_dummy->func.state_get = NULL;
     itc_dummy->func.del = NULL;
 
-    Elm_Genlist_Item_Class *itc_1text_1icon = elm_genlist_item_class_new();
-    itc_1text_1icon->item_style = "drawing";
-    itc_1text_1icon->func.text_get = __emoticon_gl_text_get;
-    itc_1text_1icon->func.content_get = __emoticon_gl_1_content_get;
-    itc_1text_1icon->func.state_get = NULL;
-    itc_1text_1icon->func.del = NULL;
+    Elm_Genlist_Item_Class *itc_1text_1icon = NULL;
+    if (app_data->mime_type == MIME_TYPE_ALL) {
+        itc_1text_1icon = elm_genlist_item_class_new();
+        itc_1text_1icon->item_style = "drawing";
+        itc_1text_1icon->func.text_get = __emoticon_gl_text_get;
+        itc_1text_1icon->func.content_get = __emoticon_gl_1_content_get;
+        itc_1text_1icon->func.state_get = NULL;
+        itc_1text_1icon->func.del = NULL;
+    }
 
     Elm_Genlist_Item_Class *itc_group = elm_genlist_item_class_new();
     itc_group->item_style = "groupindex";
@@ -915,8 +917,10 @@ void _update_emoticon_items(void *data)
     it_emoticon_empty = elm_genlist_item_append(gl, itc_dummy, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
     // Drawing
-    it_drawing = elm_genlist_item_append(gl, itc_1text_1icon, "Doodle", NULL, ELM_GENLIST_ITEM_NONE, _drawing_item_clicked_cb, (void *)app_data);
-    first_it = it_drawing;
+    if (app_data->mime_type == MIME_TYPE_ALL) {
+        it_drawing = elm_genlist_item_append(gl, itc_1text_1icon, "Doodle", NULL, ELM_GENLIST_ITEM_NONE, _drawing_item_clicked_cb, (void *)app_data);
+        first_it = it_drawing;
+    }
 
     if (recent_emoji_list.size() > 0) {
         if (is_content_reuse_on) {
@@ -989,3 +993,12 @@ void ise_show_emoticon_list(void *data)
     }
     _update_emoticon_items(emoticon_list);
 }
+
+void launch_drawing_app(void *data)
+{
+    App_Data* ad = (App_Data*) data;
+    if (!ad)
+        return;
+
+    _drawing_item_clicked_cb(ad, NULL, NULL);
+}