[Config] Fix wrong configuration.

 - fixed config flag name.

Change-Id: I49fa3c6180b8fad48a33f04b502454fabbe0eda8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c40c93b..650c47c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,10 +10,12 @@ SET(RESOURCE_DIR "${CMAKE_SOURCE_DIR}/res")
 SET(LOCALEDIR "/usr/apps/org.tizen.screen-reader/res/locale")
 
 IF("${SEC_FEATURE_TAPI_ENABLE}" STREQUAL "1")
-       MESSAGE("STATUS_SEC:/-${SEC_FEATURE_TAPI_ENABLE}-/")
-       SET(TAPI_REQUIRED_PKG "tapi")
-       ADD_DEFINITIONS("-DSCREEN_READER_MOBILE")
-ENDIF ()
+    MESSAGE("SEC_FEATURE_TAPI_ENABLE: ${SEC_FEATURE_TAPI_ENABLE}")
+    SET(TAPI_REQUIRED_PKG "tapi")
+ELSE()
+    MESSAGE("SEC_FEATURE_TAPI_ENABLE: ${SEC_FEATURE_TAPI_ENABLE}")
+    ADD_DEFINITIONS("-DSCREEN_READER_TV")
+ENDIF()
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED

diff --git a/include/screen_reader_system.h b/include/screen_reader_system.h
index e77c3c1..c2031a6 100644 (file)
--- a/include/screen_reader_system.h
+++ b/include/screen_reader_system.h
@@ -1,4 +1,4 @@
-#ifdef SCREEN_READER_MOBILE
+#ifndef SCREEN_READER_TV
 void system_notifications_init(void);
 void system_notifications_shutdown(void);
 

diff --git a/packaging/org.tizen.screen-reader.spec b/packaging/org.tizen.screen-reader.spec
index f96cb0b..0743275 100755 (executable)
--- a/packaging/org.tizen.screen-reader.spec
+++ b/packaging/org.tizen.screen-reader.spec
@@ -28,9 +28,9 @@ BuildRequires:  pkgconfig(check)
 BuildRequires:  pkgconfig(capi-network-bluetooth)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(capi-network-wifi)
-#%if "%{?tizen_profile_name}" != "tv"
+%if "%{?tizen_profile_name}" != "tv"
 BuildRequires:  pkgconfig(tapi)
-#%endif
+%endif
 
 %description
 An utility library for developers of the menu screen.

diff --git a/src/main.c b/src/main.c
index aa421d9..f99d7a7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -199,8 +199,10 @@ static int app_create(void *data)
    logger_init();
    screen_reader_switch_enabled_set(EINA_TRUE);
    screen_reader_create_service(data);
+#ifndef SCREEN_READER_TV
    screen_reader_gestures_init();
    navigator_init();
+#endif
 
    return 0;
 }
@@ -208,11 +210,12 @@ static int app_create(void *data)
 static int app_terminate(void *data)
 {
    DEBUG("screen reader terminating");
-
+#ifndef SCREEN_READER_TV
    DEBUG("terminate navigator");
    navigator_shutdown();
    DEBUG("terminate gestures");
    screen_reader_gestures_shutdown();
+#endif
    DEBUG("terminate service");
    screen_reader_terminate_service(data);
    DEBUG("clear ScreenReaderEnabled property");

diff --git a/src/navigator.c b/src/navigator.c
index 694541a..4c8e40d 100644 (file)
--- a/src/navigator.c
+++ b/src/navigator.c
@@ -1933,7 +1933,7 @@ static void on_gesture_detected(void *data, Gesture_Info *info)
          _start_stop_signal_send();
          break;
       case TWO_FINGERS_TRIPLE_TAP:
-#ifdef SCREEN_READER_MOBILE
+#ifndef SCREEN_READER_TV
          _read_quickpanel();
 #endif
          break;
@@ -2085,7 +2085,7 @@ void navigator_init(void)
    window_tracker_register(on_window_activate, NULL);
    window_tracker_active_window_request();
    smart_notification_init();
-#ifdef SCREEN_READER_MOBILE
+#ifndef SCREEN_READER_TV
    system_notifications_init();
 #endif
    keyboard_tracker_init();
@@ -2113,7 +2113,7 @@ void navigator_shutdown(void)
    app_tracker_shutdown();
    window_tracker_shutdown();
    smart_notification_shutdown();
-#ifdef SCREEN_READER_MOBILE
+#ifndef SCREEN_READER_TV
    system_notifications_shutdown();
 #endif
    keyboard_tracker_shutdown();

diff --git a/src/screen_reader.c b/src/screen_reader.c
index 7f21e89..7f4f6bd 100644 (file)
--- a/src/screen_reader.c
+++ b/src/screen_reader.c
@@ -31,10 +31,10 @@ Service_Data service_data =
 {
    //Set by vconf
    .run_service = 1,
-#ifdef SCREEN_READER_MOBILE
-   .tracking_signal_name = HIGHLIGHT_CHANGED_SIG,
-#else
+#ifdef SCREEN_READER_TV
    .tracking_signal_name = FOCUS_CHANGED_SIG,
+#else
+   .tracking_signal_name = HIGHLIGHT_CHANGED_SIG,
 #endif
 
    //Set by tts
@@ -59,7 +59,9 @@ int screen_reader_create_service(void *data)
    vconf_init(service_data);
    tts_init(service_data);
 
+#ifdef SCREEN_READER_TV
    spi_init(service_data);
+#endif
 
    /* XML TEST */
 #ifdef RUN_IPC_TEST_SUIT

diff --git a/src/screen_reader_system.c b/src/screen_reader_system.c
index f23023c..c0337cf 100644 (file)
--- a/src/screen_reader_system.c
+++ b/src/screen_reader_system.c
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-#define _GNU_SOURCE
-
-
-#ifdef SCREEN_READER_MOBILE
+#ifndef SCREEN_READER_TV
 
+#define _GNU_SOURCE
 
 #include <device/battery.h>
 #include <device/display.h>