build fix

1. update after vconf api changes
2. update atspi listeners callbacks

Change-Id: If971e87a5f66ab6a1e91d22a102b388a28588e3a

diff --git a/include/screen_reader_spi.h b/include/screen_reader_spi.h
index 31e93dc..9dd47e8 100644 (file)
--- a/include/screen_reader_spi.h
+++ b/include/screen_reader_spi.h
@@ -12,8 +12,8 @@
 #include "screen_reader.h"
 
 void spi_init(Service_Data *sd);
-void spi_on_state_changed_cb(const AtspiEvent *event, void *user_data);
-void spi_on_caret_move_cb(const AtspiEvent *event, void *user_data);
-void spi_on_access_value_changed_cb(const AtspiEvent *event, void *user_data);
+void spi_on_state_changed_cb(AtspiEvent *event, void *user_data);
+void spi_on_caret_move_cb(AtspiEvent *event, void *user_data);
+void spi_on_access_value_changed_cb(AtspiEvent *event, void *user_data);
 
 #endif /* SCREEN_READER_SPI_H_ */

diff --git a/src/screen_reader_spi.c b/src/screen_reader_spi.c
index fd01edf..83f7630 100644 (file)
--- a/src/screen_reader_spi.c
+++ b/src/screen_reader_spi.c
@@ -64,7 +64,7 @@ Eina_Bool double_click_timer_cb(void *data)
   * @param user_data screen-reader internal data
   *
 **/
-void spi_on_state_changed_cb(const AtspiEvent *event, void *user_data)
+void spi_on_state_changed_cb(AtspiEvent *event, void *user_data)
 {
     DEBUG("START");
     DEBUG("STATE CHANGED");
@@ -108,7 +108,7 @@ void spi_on_state_changed_cb(const AtspiEvent *event, void *user_data)
   * @param user_data screen-reader internal data
   *
 **/
-void spi_on_caret_move_cb(const AtspiEvent *event, void *user_data)
+void spi_on_caret_move_cb(AtspiEvent *event, void *user_data)
 {
     DEBUG("START");
     DEBUG("CARET MOVED");
@@ -176,7 +176,7 @@ void spi_on_caret_move_cb(const AtspiEvent *event, void *user_data)
   * @param user_data screen-reader internal data
   *
 **/
-void spi_on_access_value_changed_cb(const AtspiEvent *event, void *user_data)
+void spi_on_access_value_changed_cb(AtspiEvent *event, void *user_data)
 {
     DEBUG("START");
     DEBUG("STATE CHANGED");

diff --git a/src/screen_reader_tts.c b/src/screen_reader_tts.c
index a65aa1b..72baaf7 100644 (file)
--- a/src/screen_reader_tts.c
+++ b/src/screen_reader_tts.c
@@ -78,7 +78,7 @@ static char * get_tts_state( tts_state_e r )
 
 //-------------------------------------------------------------------------------------------------
 
-bool get_supported_voices_cb(tts_h tts, const char* language, int voice_type, void* user_data)
+bool get_supported_voices_cb(tts_h tts, const char* language, tts_voice_type_e voice_type, void* user_data)
 {
     DEBUG("LANG: %s; TYPE: %d", language, voice_type);
 

diff --git a/src/screen_reader_vconf.c b/src/screen_reader_vconf.c
index 1f5f550..2ec6ea8 100644 (file)
--- a/src/screen_reader_vconf.c
+++ b/src/screen_reader_vconf.c
@@ -121,10 +121,10 @@ bool set_tracking_listener(Service_Data *sd, const char *signal_name)
 void information_level_cb(keynode_t *node, void *user_data)
 {
        DEBUG("START");
-       DEBUG("Information level set: %d", node->value.i);
+       DEBUG("Information level set: %d", vconf_keynode_get_int(node));
 
        Service_Data *service_data = user_data;
-       service_data->information_level = node->value.i;
+       service_data->information_level = vconf_keynode_get_int(node);
 
        DEBUG("END");
 }
@@ -132,10 +132,10 @@ void information_level_cb(keynode_t *node, void *user_data)
 void app_termination_cb(keynode_t *node, void *user_data)
 {
        DEBUG("START");
-       DEBUG("Application terminate %d", !node->value.i);
+       DEBUG("Application terminate %d", !(vconf_keynode_get_int(node)));
 
        Service_Data *service_data = user_data;
-       service_data->run_service = node->value.i;
+       service_data->run_service = vconf_keynode_get_int(node);
 
        if(service_data->run_service == 0)
        {
@@ -148,14 +148,14 @@ void app_termination_cb(keynode_t *node, void *user_data)
 void language_cb(keynode_t *node, void *user_data)
 {
        DEBUG("START");
-       DEBUG("Trying to set language to: %s", node->value.s);
+       DEBUG("Trying to set language to: %s", vconf_keynode_get_str(node));
 
        Service_Data *sd = user_data;
 
        int voice_type;
 
        vconf_get_int("db/setting/accessibility/voice", (int*)(&voice_type));
-       set_langauge(sd, node->value.s, voice_type);
+       set_langauge(sd, vconf_keynode_get_str(node), voice_type);
 
        DEBUG("END");
 }
@@ -163,12 +163,12 @@ void language_cb(keynode_t *node, void *user_data)
 void voice_cb(keynode_t *node, void *user_data)
 {
        DEBUG("START");
-       DEBUG("Voice set to: %d", node->value.i);
+       DEBUG("Voice set to: %d", vconf_keynode_get_int(node));
 
        Service_Data *sd = user_data;
 
        const char *lang = vconf_get_str("db/setting/accessibility/language");
-       set_langauge(sd, lang, (int)node->value.i);
+       set_langauge(sd, lang, vconf_keynode_get_int(node));
 
        DEBUG("END");
 }
@@ -176,10 +176,10 @@ void voice_cb(keynode_t *node, void *user_data)
 void reading_speed_cb(keynode_t *node, void *user_data)
 {
        DEBUG("START");
-       DEBUG("Reading speed set to: %d", node->value.i);
+       DEBUG("Reading speed set to: %d", vconf_keynode_get_int(node));
 
        Service_Data *service_data = user_data;
-       service_data->reading_speed = node->value.i;
+       service_data->reading_speed = vconf_keynode_get_int(node);
 
        DEBUG("END");
 }
@@ -187,7 +187,7 @@ void reading_speed_cb(keynode_t *node, void *user_data)
 void tracking_signal_changed_cb(keynode_t *node, void *user_data)
 {
        DEBUG("START");
-       DEBUG("Tracking signal set to: %s", node->value.s);
+       DEBUG("Tracking signal set to: %s", vconf_keynode_get_str(node));
 
        Service_Data *sd = user_data;
        const char *tracking_signal = vconf_get_str("db/setting/accessibility/tracking_signal");

diff --git a/src/smart_notification.c b/src/smart_notification.c
index 902d9c3..c9e1e8f 100644 (file)
--- a/src/smart_notification.c
+++ b/src/smart_notification.c
@@ -89,7 +89,7 @@ void get_realized_items_count(AtspiAccessible *scrollable_object, int *start_idx
  * @param user_data UNUSED
  */
 static void
-_scroll_event_cb(const AtspiEvent     *event, gpointer user_data)
+_scroll_event_cb(AtspiEvent     *event, void *user_data)
 {
    if(!status)
         return;