Fix remote input to work in only TV profile

Change-Id: Ib868191d46fa2edf722d7298f6cededde95d3610
(cherry picked from commit 5eb2f5c6f98246cbe1af99f5aad62df5b78cacb3)

diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index 7afc599cd8c934e74f429c8c9d6f108c25353889..280b0fe1b010de081707b9b37c2015fde2d7a535 100644 (file)
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -7780,18 +7780,18 @@ int main (int argc, char *argv [])
          LOGW ("bt_hid_host_initialize failed");
 #endif
 
-#if ENABLE_REMOTE_INPUT
-    launch_remote_input = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_LAUNCH_REMOTE_INPUT), launch_remote_input);
+    if (_TV) {
+        launch_remote_input = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_LAUNCH_REMOTE_INPUT), launch_remote_input);
 
-     /* Create remote input */
-    if (launch_remote_input) {
-         LOGD("remote input start");
-         remote_input_impl = new Remote_Input();
-         if (remote_input_impl) {
-             remote_input_impl->init(_info_manager);
-         }
+         /* Create remote input */
+        if (launch_remote_input) {
+             LOGD("remote input start");
+             remote_input_impl = new Remote_Input();
+             if (remote_input_impl) {
+                 remote_input_impl->init(_info_manager);
+             }
+        }
     }
-#endif
 
 #if ISF_BUILD_CANDIDATE_UI
     _system_scale = elm_config_scale_get ();

diff --git a/ism/src/isf_remote_client.cpp b/ism/src/isf_remote_client.cpp
index bfbb5f073e566d29764e3c5f63d36d4e48c9c1d5..a3d2062b536d28a3739b9d254e839ee67d1b1802 100644 (file)
--- a/ism/src/isf_remote_client.cpp
+++ b/ism/src/isf_remote_client.cpp
@@ -161,10 +161,6 @@ public:
 
     int open_connection (void) {
         String display;
-#ifndef ENABLE_REMOTE_INPUT
-        const char *p = getenv ("DISPLAY");
-        if (p) display = String (p);
-#endif
         SocketAddress addr (scim_get_default_panel_socket_address (display));
 
         if (m_socket_remoteinput2panel.is_connected ()) close_connection ();