Modified to call language_changed, accessibility_changed callback on the C# IME

Change-Id: Ib3e192d75c959d5835d9b470302cd8377a3dfe76
(cherry picked from commit 418dbed7672e4315ebcf0dec5d9148f0df46041b)

diff --git a/src/sclcoreui-efl.cpp b/src/sclcoreui-efl.cpp
index 869af01..4b7d97b 100644 (file)
--- a/src/sclcoreui-efl.cpp
+++ b/src/sclcoreui-efl.cpp
@@ -183,6 +183,7 @@ void CSCLCoreUIEFL::get_keyboard_size(SclSize *portrait, SclSize *landscape)
     *landscape = m_landscape_size;
 }
 
+#ifdef WAYLAND
 static int language_changed_cb(void *event_info, void* data)
 {
     char clang[_POSIX_PATH_MAX] = {0};
@@ -226,7 +227,6 @@ static void accessibility_changed_cb(keynode_t *key, void* data)
     }
 }
 
-#ifdef WAYLAND
 static void win_rotation_changed_cb(void *data, Evas_Object *obj, void *event)
 {
     int degree = elm_win_rotation_get(obj);
@@ -493,6 +493,14 @@ sclboolean CSCLCoreUIEFL::create_main_window()
     set_keyboard_size_hints(portrait, landscape);
 
 #ifdef WAYLAND
+    appcore_set_event_callback(APPCORE_EVENT_LANG_CHANGE, language_changed_cb, NULL);
+
+    vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, accessibility_changed_cb, NULL);
+
+    /* Should we call these callback functions here? */
+    language_changed_cb(NULL, NULL);
+    accessibility_changed_cb(NULL, NULL);
+
     evas_object_smart_callback_add(main_window, "wm,rotation,changed", win_rotation_changed_cb, NULL);
     evas_object_show(main_window);
 #else
@@ -514,14 +522,6 @@ int CSCLCoreUIEFL::create(void *data)
         }
     }
 
-    appcore_set_event_callback(APPCORE_EVENT_LANG_CHANGE, language_changed_cb, NULL);
-
-    vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, accessibility_changed_cb, NULL);
-
-    /* Should we call these callback functions here? */
-    language_changed_cb(NULL, NULL);
-    accessibility_changed_cb(NULL, NULL);
-
     signal(SIGQUIT, signal_handler);
     signal(SIGTERM, signal_handler);
     signal(SIGINT,  signal_handler);
@@ -536,10 +536,6 @@ int CSCLCoreUIEFL::terminate(void *data)
     if (impl)
         impl->fini();
 
-    appcore_set_event_callback(APPCORE_EVENT_LANG_CHANGE, NULL, NULL);
-
-    vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, accessibility_changed_cb);
-
 #ifndef WAYLAND
     if (XClientMsgHandler) {
         ecore_event_handler_del(XClientMsgHandler);