Change variable name in voice layout

Change-Id: Ia25b9ec006db5b2f63bcbe70ae55db8118325ccc
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/include/ise-stt-mode.h b/src/include/ise-stt-mode.h
index 19d329a..db1f3d7 100644 (file)
--- a/src/include/ise-stt-mode.h
+++ b/src/include/ise-stt-mode.h
@@ -78,7 +78,7 @@ struct _VoiceData
 {
     int voicefw_state; //0 means init failed else success
     stt_h voicefw_handle; //Wonyoung Lee added
-    Evas_Object *naviframe; //main window
+    Evas_Object *win; //main window
     Evas_Object *layout_main; //layout
     Evas_Object *progressbar; //progressbar
     Evas_Object *scroller; //scroller

diff --git a/src/ise-stt-mode.cpp b/src/ise-stt-mode.cpp
index 6e5b847..ea0e7a4 100644 (file)
--- a/src/ise-stt-mode.cpp
+++ b/src/ise-stt-mode.cpp
@@ -552,7 +552,7 @@ int init_voicedata(VoiceData *r_voicedata)
 
     voicedata->voicefw_state = 0;
     voicedata->voicefw_handle = NULL;
-    voicedata->naviframe = NULL;
+    voicedata->win = NULL;
     voicedata->layout_main = NULL;
     voicedata->progressbar = NULL;
     voicedata->scroller = NULL;
@@ -613,9 +613,9 @@ int init_voice(Evas_Object *parent, const char *lang, VoiceData *r_voicedata)
 
     LOGD("Voice input active language is : %s", voicedata->kbd_lang);
 
-    voicedata->naviframe = parent;
+    voicedata->win = parent;
 
-    if (NULL == voicedata->naviframe) {
+    if (NULL == voicedata->win) {
         return FALSE;
     }
 
@@ -734,7 +734,7 @@ Eina_Bool init_view(void *data)
         return ECORE_CALLBACK_CANCEL;
     }
 
-    voicedata->layout_main = create_fullview(voicedata->naviframe, voicedata);
+    voicedata->layout_main = create_fullview(voicedata->win, voicedata);
 
     if (voicedata->layout_main) {
         evas_object_show(voicedata->layout_main);
@@ -790,8 +790,8 @@ void on_destroy(VoiceData *r_voicedata)
             voicedata->layout_main = NULL;
         }
 
-        if (NULL != voicedata->naviframe) {
-            voicedata->naviframe = NULL;
+        if (NULL != voicedata->win) {
+            voicedata->win = NULL;
         }
 
         if (NULL != voicedata->start_timer) {
@@ -894,9 +894,9 @@ void show_voice_input(Evas_Object *parent, const char *lang, void (*get_string)(
     if (my_voicedata) {
         init = init_voice(parent, lang, my_voicedata);
         if (init) {
-            if (my_voicedata->naviframe) {
+            if (my_voicedata->win) {
                 //ise_stt_start(my_voicedata);
-                show_voice_window(my_voicedata->naviframe, my_voicedata);
+                show_voice_window(my_voicedata->win, my_voicedata);
             }
         } else {
             destroy_voice();