Refactor code to access emoticon list

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

diff --git a/src/include/ise-emoticon-mode.h b/src/include/ise-emoticon-mode.h
index e2a82ac..b897f1f 100644 (file)
--- a/src/include/ise-emoticon-mode.h
+++ b/src/include/ise-emoticon-mode.h
@@ -74,6 +74,7 @@ size_t get_emoticon_list_recent_size();
 
 emoticon_group_t get_current_emoticon_group();
 void set_current_emoticon_group(emoticon_group_t emoticon_group);
+int get_emoticon_code(unsigned int group, unsigned int index);
 
 #endif /* SUPPORTS_EMOTICONS */
 #endif /* ISE_EMOTICON_MODE_H_ */

diff --git a/src/ise-emoticon-list.cpp b/src/ise-emoticon-list.cpp
index ab0a4e7..2aaf04a 100644 (file)
--- a/src/ise-emoticon-list.cpp
+++ b/src/ise-emoticon-list.cpp
@@ -55,7 +55,7 @@ int emoticon_list_3[EMOTICON_GROUP_3_NUM] = {
     0x1f42f
 };
 
-int * emoticon_list[] =
+static int * emoticon_list[] =
 {
     emoticon_list_1,
     emoticon_list_2,
@@ -864,4 +864,9 @@ const char *ise_get_emoticon_group_name(int id)
     else
         return NULL;
 }
+
+int get_emoticon_code(unsigned int group, unsigned int index)
+{
+    return emoticon_list[group][index];
+}
 #endif

diff --git a/src/ise-emoticon-mode.cpp b/src/ise-emoticon-mode.cpp
index 830f17a..59d4146 100644 (file)
--- a/src/ise-emoticon-mode.cpp
+++ b/src/ise-emoticon-mode.cpp
@@ -112,8 +112,6 @@ static bool is_emoticon_mode = false;
 static emoticon_group_t current_emoticon_group = EMOTICON_GROUP_RECENTLY_USED;
 static std::vector <int> emoticon_list_recent;
 
-// extern int * emoticon_list[];
-
 size_t get_emoticon_list_recent_size()
 {
     return emoticon_list_recent.size();
@@ -535,11 +533,11 @@ static void __ise_emoticon_append_items_to_gengrid(emoticon_group_t emoticon_gro
             items = emoticon_group_items[emoticon_group];
         }
         for (int i = 0; i < items; i++) {
-            snprintf(img_name, 10, "%x", emoticon_list[emoticon_group-1][i]);
+            snprintf(img_name, 10, "%x", get_emoticon_code(emoticon_group-1, i));
             file_path = (std::string)EMOTICON_DIR + (std::string)"u" + (std::string)img_name + (std::string)".png";
             if (ise_util_does_file_exists(file_path)) {
-                emoticon_items[i].code = emoticon_list[emoticon_group-1][i];
-                emoticon_items[i].keyevent = emoticon_list[emoticon_group-1][i];
+                emoticon_items[i].code = get_emoticon_code(emoticon_group-1, i);
+                emoticon_items[i].keyevent = get_emoticon_code(emoticon_group-1, i);
                 emoticon_items[i].path = file_path;
                 emoticon_items[i].item = elm_gengrid_item_append(gengrid, gic, &(emoticon_items[i]), _item_selected, &(emoticon_items[i]));
 //              PRINTFUNC(SECURE_DEBUG,"file_path = %s\n",file_path.c_str());
@@ -622,9 +620,9 @@ static void __ise_emoticon_append_items_to_gengrid(emoticon_group_t emoticon_gro
             items = emoticon_group_items[emoticon_group];
         }
         for (int i = 0; i < items; i++) {
-            snprintf(img_name, 10, "%x", emoticon_list[emoticon_group-1][i]);
+            snprintf(img_name, 10, "%x", get_emoticon_code(emoticon_group-1, i));
             file_path = (std::string)img_name;
-            emoticon_items[i].keyevent = emoticon_list[emoticon_group-1][i];
+            emoticon_items[i].keyevent = get_emoticon_code(emoticon_group-1, i);
             emoticon_items[i].path = file_path;
             emoticon_items[i].item = elm_gengrid_item_append(gengrid, gic, &(emoticon_items[i]), _item_selected, &(emoticon_items[i]));
         }