Fix dlog print macro

Change-Id: Ie1588b044d783c5a97e9e5ffcb3fdfc83c457021
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/inc/callui-debug.h b/inc/callui-debug.h
index ec81371..3ec87dd 100644 (file)
--- a/inc/callui-debug.h
+++ b/inc/callui-debug.h
@@ -24,15 +24,18 @@
 #define CALLUI_LOG_TAG "CALLUI"
 #endif
 
+#undef LOG_TAG
+#define LOG_TAG CALLUI_LOG_TAG
+
 #define info(fmt, args...)   { __dlog_print(LOG_ID_MAIN, DLOG_INFO,  CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); }
 #define dbg(fmt, args...)    { __dlog_print(LOG_ID_MAIN, DLOG_DEBUG, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); }
 #define warn(fmt, args...)   { __dlog_print(LOG_ID_MAIN, DLOG_WARN,  CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); }
 #define err(fmt, args...)    { __dlog_print(LOG_ID_MAIN, DLOG_ERROR, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); }
 #define fatal(fmt, args...)  { __dlog_print(LOG_ID_MAIN, DLOG_FATAL, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); }
 
-#define sec_err(fmt, arg...)  {SECURE_LOGE(CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##arg); }
-#define sec_warn(fmt, arg...) {SECURE_LOGW(CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##arg); }
-#define sec_dbg(fmt, arg...)  {SECURE_LOGD(CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##arg); }
+#define sec_err(fmt, arg...)  {SECURE_LOGE("%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##arg); }
+#define sec_warn(fmt, arg...) {SECURE_LOGW("%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##arg); }
+#define sec_dbg(fmt, arg...)  {SECURE_LOGD("%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##arg); }
 
 #define debug_trace(fmt, args...)      do { info(fmt, ##args); } while (0)
 #define debug_enter()                          do { debug_trace(" * Enter * "); } while (0)

diff --git a/src/callui-window.c b/src/callui-window.c
index e81d166..d8bae65 100644 (file)
--- a/src/callui-window.c
+++ b/src/callui-window.c
@@ -465,11 +465,11 @@ callui_result_e _callui_window_set_keygrab_mode(callui_window_h window_h, const
                        mode <= CALLUI_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE, CALLUI_RESULT_INVALID_PARAM);
 
        if (!elm_win_keygrab_unset(window_h->win, key, 0, 0)) {
-               dbg("Can not unset keygrab key[%s]. Probably key grab was not set");
+               dbg("Can not unset keygrab key[%s]. Probably key grab was not set", key);
        }
 
        if (!elm_win_keygrab_set(window_h->win, key, 0, 0, 0, __convert_app_keygrab_mode(mode))) {
-               err("elm_win_keygrab_set() failed! key[%s] mode[%d]");
+               err("elm_win_keygrab_set() failed! key[%s] mode[%d]", key, mode);
                return CALLUI_RESULT_FAIL;
        }
        return CALLUI_RESULT_OK;
@@ -481,7 +481,7 @@ callui_result_e _callui_window_unset_keygrab_mode(callui_window_h window_h, cons
        CALLUI_RETURN_VALUE_IF_FAIL(key, CALLUI_RESULT_INVALID_PARAM);
 
        if (!elm_win_keygrab_unset(window_h->win, key, 0, 0)) {
-               err("elm_win_keygrab_unset() failed! key[%s]");
+               err("elm_win_keygrab_unset() failed! key[%s]", key);
                return CALLUI_RESULT_FAIL;
        }
        return CALLUI_RESULT_OK;