Support to delegate various MIME types to caller as like voice recording

[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 b7afb02..4bd585b 100755 (executable)
--- a/src/w-input-emoticon.cpp
+++ b/src/w-input-emoticon.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <app.h>
 #include <app_preference.h>
 #include <Elementary.h>
 #include <string>
@@ -375,13 +376,13 @@ 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");
+    reply_to_sender_by_callback((const char*)utf_8, "emoticon", NULL);
 
     PRINTFUNC(SECURE_DEBUG, "[%d]%s", index, utf_8);
     if (utf_8)
         free(utf_8);
 
-    elm_exit();
+    ui_app_exit();
 }
 
 Evas_Object* get_emoticon_button(Evas_Object* parent, int index){
@@ -767,7 +768,10 @@ Evas_Object* _create_emoticon_genlist(void* data)
     evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_show(genlist);
 
-    Elm_Object_Item *nf_emoticon_item = elm_naviframe_item_push(ad->naviframe, NULL, NULL, NULL, genlist, "empty");
+    const char *item_style = NULL;
+    if (_WEARABLE)
+        item_style = "empty";
+    Elm_Object_Item *nf_emoticon_item = elm_naviframe_item_push(ad->naviframe, NULL, NULL, NULL, genlist, item_style);
 
     elm_naviframe_item_pop_cb_set(nf_emoticon_item, _custom_back_cb2, ad);