[Call UI] Fix GBS build

Change-Id: I0944534419b8590eefa3e4f1261e02fb1e5cc13a

diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index 6821c61..a67b228 100755 (executable)
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -52,6 +52,7 @@ pkg_check_modules (pkgs REQUIRED
        capi-system-sensor
        capi-ui-efl-util
        libtzplatform-config
+       capi-base-utils-i18n
 )
 
 FOREACH(flag ${pkgs_CFLAGS})

diff --git a/packaging/org.tizen.call-ui.spec b/packaging/org.tizen.call-ui.spec
index 3860e0e..e4035ac 100644 (file)
--- a/packaging/org.tizen.call-ui.spec
+++ b/packaging/org.tizen.call-ui.spec
@@ -18,6 +18,7 @@ BuildRequires:  pkgconfig(appsvc)
 BuildRequires:  pkgconfig(callmgr_client)
 BuildRequires:  pkgconfig(msg-service)
 BuildRequires:  pkgconfig(efl-extension)
+BuildRequires:  pkgconfig(capi-base-utils-i18n)
 BuildRequires:  cmake
 BuildRequires:  gettext-tools
 BuildRequires:  edje-tools

diff --git a/src/callui-common.c b/src/callui-common.c
index 1849d19..adbddc1 100755 (executable)
--- a/src/callui-common.c
+++ b/src/callui-common.c
@@ -600,7 +600,7 @@ callui_result_e _callui_common_get_last_msg_data(void *appdata, const char *tel_
 
        dbg("conversation - msg count [%d]", msg_conv_list.nCount);
 
-       char msg_txt[MAX_MSG_TEXT_LEN + 1] = { 0 };
+       char msg_txt[MAX_MSG_TEXT_LEN + 1] = { '\0' };
        int msg_txt_size;
        int msg_direct;
        int msg_time;
@@ -620,7 +620,7 @@ callui_result_e _callui_common_get_last_msg_data(void *appdata, const char *tel_
        }
        msg_release_list_struct(&msg_conv_list);
 
-       if (!STRING_EMPTY(msg_txt)) {
+       if (msg_txt[0] != '\0') {
                dbg("last incoming msg found - txt[%s], txt_size[%d], time[%d]", msg_txt, msg_txt_size, msg_time);
                snprintf(msg_data->text, msg_txt_size, "%s", msg_txt);
                msg_data->date = msg_time;
@@ -902,7 +902,7 @@ static char *__get_date_text(i18n_udatepg_h pattern_generator, const char *local
        i18n_ustring_copy_ua_n(custom_skeleton, skeleton, skeletonLength);
        __generate_best_pattern(pattern_generator, locale, custom_skeleton, formatted_string, time);
 
-       CALLUI_RETURN_NULL_IF_FAIL(!STRING_EMPTY(formatted_string));
+       CALLUI_RETURN_NULL_IF_FAIL(formatted_string[0] != '\0');
        return strdup(formatted_string);
 }
 

diff --git a/src/callui-view-incoming-call-noti.c b/src/callui-view-incoming-call-noti.c
index 3bf87a0..b98c113 100644 (file)
--- a/src/callui-view-incoming-call-noti.c
+++ b/src/callui-view-incoming-call-noti.c
@@ -568,7 +568,8 @@ static callui_result_e __rm_create_message_items(callui_view_incoming_call_noti_
        callui_result_e res = _callui_common_get_reject_msg_count(&item_count);
        CALLUI_RETURN_VALUE_IF_FAIL(res == CALLUI_RESULT_OK, -1);
 
-       for (int i = 0; i < item_count; i++) {
+       int i = 0;
+       for (; i < item_count; i++) {
                Evas_Object *item_ly = _callui_load_edj(box, CALLUI_CALL_EDJ_PATH, "reject_msg_item");
                CALLUI_RETURN_VALUE_IF_FAIL(item_ly, CALLUI_RESULT_FAIL);