Remove global variable to get the size of smartreply

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

diff --git a/src/ise.cpp b/src/ise.cpp
index b8f50de..b29d01d 100644 (file)
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -87,7 +87,6 @@ static string g_current_punctuation[MAX_DEFAULT_PUNCTUATION-1] = {"RCENT1", "RCE
 static vector<string> g_softcandidate_string;
 static bool g_softcandidate_show = false;
 static bool g_input_panel_show = false;
-static unsigned int g_smartreply_size = 0;
 static bool g_caps_mode_pending = false;
 static bool g_floating_mode = false;
 static bool g_candidate_more_view = false;
@@ -158,6 +157,8 @@ class CandidateEventListener: public EventListener
             const MultiEventDesc &multidesc = dynamic_cast<const MultiEventDesc &>(desc);
             LANGUAGE_INFO *info = _language_manager.get_language_info(_language_manager.get_current_language());
 
+            unsigned int smartreply_size = input_smartreply_get_reply_num();
+
             switch (multidesc.type) {
                 case MultiEventDesc::CANDIDATE_ITEM_MOUSE_DOWN:
                     if (g_autofill_exist) {
@@ -167,22 +168,22 @@ class CandidateEventListener: public EventListener
                                 ise_send_string(text);
                                 free(text);
                             }
-                        } else if (multidesc.index < (int)g_smartreply_size + 1) {
+                        } else if (multidesc.index < (int)smartreply_size + 1) {
                             ise_send_string(g_softcandidate_string[multidesc.index].c_str());
                         } else {
                             if (info && info->load_in_ime)
-                                ime_select_candidate(multidesc.index - g_smartreply_size - 1);
+                                ime_select_candidate(multidesc.index - smartreply_size - 1);
                             else
-                                engine_loader_select_candidate(multidesc.index - g_smartreply_size - 1);
+                                engine_loader_select_candidate(multidesc.index - smartreply_size - 1);
                         }
                     } else {
-                        if (multidesc.index < (int)g_smartreply_size)
+                        if (multidesc.index < (int)smartreply_size)
                             ise_send_string(g_softcandidate_string[multidesc.index].c_str());
                         else {
                             if (info && info->load_in_ime)
-                                ime_select_candidate(multidesc.index - g_smartreply_size);
+                                ime_select_candidate(multidesc.index - smartreply_size);
                             else
-                                engine_loader_select_candidate(multidesc.index - g_smartreply_size);
+                                engine_loader_select_candidate(multidesc.index - smartreply_size);
                         }
                     }
                     break;
@@ -303,7 +304,6 @@ static void _input_smartreply_notify_cb(void *user_data)
                 candidate = reply;
                 if (candidate) {
                     g_smartreply_strings.push_back(string(candidate));
-                    g_smartreply_size++;
                     free(candidate);
                     candidate = NULL;
                 }
@@ -2872,7 +2872,6 @@ static void ime_app_focus_out_cb(int context_id, void *user_data)
 #ifdef HAVE_CBHM
     g_set_mime_type = FALSE;
 #endif
-    g_smartreply_size = 0;
     input_smartreply_deinit();
     g_ic_smartreply = -1;
 
@@ -3211,7 +3210,6 @@ static void ime_app_prediction_hint_set_cb(const char *prediction_hint, void *us
         input_smartreply_set_notify(_input_smartreply_notify_cb, NULL);
 
         if (input_smartreply_is_enabled()) {
-            g_smartreply_size = 0;
             input_smartreply_get_reply_async();
         }
     }