apply core log msg manual

Change-Id: I2d0b57b252acbca56db5f2fca5277a2b837e87d0

diff --git a/client/ug-client.c b/client/ug-client.c
index 5d36b062e590c9a02117193ed89266c348fc6a57..b8e025b87e2865041388650b8d5f4976916634b1 100755 (executable)
--- a/client/ug-client.c
+++ b/client/ug-client.c
@@ -35,7 +35,7 @@
 #undef LOG_TAG
 #endif
 
-#define LOG_TAG "UGClient"
+#define LOG_TAG "UI_GADGET_CLIENT"
 
 static void prt_usage(const char *cmd)
 {
@@ -146,7 +146,7 @@ void result_cb(ui_gadget_h ug, service_h result, void *priv)
 
        ret = service_reply_to_launch_request(result, ad->request, SERVICE_RESULT_SUCCEEDED);
        if (ret != SERVICE_ERROR_NONE)
-               LOGE("service_reply_to_launch_request failed, %d\n", ret);
+               LOGE("service_reply_to_launch_request failed, %d", ret);
 }
 
 void destroy_cb(ui_gadget_h ug, void *priv)
@@ -345,7 +345,7 @@ static int app_reset(bundle *b, void *data)
 
        ad->ug = ug_create(NULL, ad->name, mode, service, &cbs);
        if (ad->ug == NULL) {
-               LOGE("ug_create fail: %s\n", ad->name);
+               LOGE("ug_create fail: %s", ad->name);
                elm_exit();
        }
 

diff --git a/include/ug-dbg.h b/include/ug-dbg.h
old mode 100644 (file)
new mode 100755 (executable)
index 2cd5bc7..65e42c3
--- a/include/ug-dbg.h
+++ b/include/ug-dbg.h
@@ -28,10 +28,10 @@
 #undef LOG_TAG
 #endif
 
-#define LOG_TAG "UIGadget-1"
+#define LOG_TAG "UI_GADGET"
 
-#define _ERR(...) LOGE(__VA_ARGS__)
-#define _DBG(...) LOGD(__VA_ARGS__)
-#define _INFO(...) LOGI(__VA_ARGS__)
+#define _ERR(fmt, arg...) LOGE("\x1b[33m" fmt "\x1b[0m", ##arg);
+#define _DBG(fmt, arg...) LOGD("\x1b[32m" fmt "\x1b[0m", ##arg);
+#define _INFO(fmt, arg...) LOGI("\x1b[31m" fmt "\x1b[0m", ##arg);
 
 #endif                         /* __UG_DBG_H__ */

diff --git a/packaging/ui-gadget-1.spec b/packaging/ui-gadget-1.spec
index 5ddffcfae2ddab37b5e308b099ba639bad423169..327386771666579b2e079a115c7df43c651f6457 100755 (executable)
--- a/packaging/ui-gadget-1.spec
+++ b/packaging/ui-gadget-1.spec
@@ -1,10 +1,10 @@
 
 Name:       ui-gadget-1
 Summary:    UI Gadget Library
-Version:    0.1.4
+Version:    0.1.5
 Release:    1
-Group:      TO_BE/FILLED_IN
-License:    TO BE FILLED IN
+Group:      System/Libraries
+License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig

diff --git a/src/engine.c b/src/engine.c
index 05afcd5ef2a830c099549002ead4c3ef57343a05..ff1f3fb13a58807272af8b4c7e42b13a1dc3952d 100755 (executable)
--- a/src/engine.c
+++ b/src/engine.c
@@ -79,13 +79,13 @@ struct ug_engine *ug_engine_load()
 
        handle = dlopen(engine_file, RTLD_LAZY);
        if (!handle) {
-               _ERR("dlopen failed: %s\n", dlerror());
+               _ERR("dlopen failed: %s", dlerror());
                goto engine_free;
        }
 
        engine_init = dlsym(handle, UG_ENGINE_INIT_SYM);
        if (!engine_init) {
-               _ERR("dlsym failed: %s\n", dlerror());
+               _ERR("dlsym failed: %s", dlerror());
                goto engine_dlclose;
        }
 
@@ -117,7 +117,7 @@ int ug_engine_unload(struct ug_engine *engine)
                if (engine_exit)
                        engine_exit(&engine->ops);
                else
-                       _ERR("dlsym failed: %s\n", dlerror());
+                       _ERR("dlsym failed: %s", dlerror());
 
                dlclose(engine->handle);
        }

diff --git a/src/manager.c b/src/manager.c
index 7ff73fddac9d0e9da34c8a5c36109c5e69892d75..1defa6182fb4f1f49e50de430517f76729e6a0b4 100755 (executable)
--- a/src/manager.c
+++ b/src/manager.c
@@ -73,7 +73,7 @@ static int ug_relation_del(ui_gadget_h ug)
 
        p = ug->parent;
        if (!p) {
-               _ERR("ug_relation_del failed: no parent\n");
+               _ERR("ug_relation_del failed: no parent");
                return -1;
        }
        p->children = g_slist_remove(p->children, ug);
@@ -119,8 +119,8 @@ static void ugman_tree_dump(ui_gadget_h ug)
        name = ug->name;
        if (ug == ug_man.root) {
                i = 0;
-               _DBG("\n============== TREE_DUMP =============\n");
-               _DBG("ROOT: Manager\n");
+               _DBG("============== TREE_DUMP =============");
+               _DBG("ROOT: Manager");
                name = "Manager";
        }
 
@@ -133,7 +133,7 @@ static void ugman_tree_dump(ui_gadget_h ug)
 
        while (child) {
                c = child->data;
-               _DBG("[%d] %s [%c] (%p) (PARENT:  %s)\n",
+               _DBG("[%d] %s [%c] (%p) (PARENT:  %s)",
                     lv,
                     c && c->name ? c->name : "NO CHILD INFO FIXIT!!!",
                     c && c->mode == UG_MODE_FULLVIEW ? 'F' : 'f', c, name);
@@ -261,7 +261,7 @@ static int ugman_indicator_update(enum ug_option opt, enum ug_event event)
        int cur_state;
 
        if (!ug_man.win) {
-               _ERR("ugman_indicator_update failed: no window\n");
+               _ERR("ugman_indicator_update failed: no window");
                return -1;
        }
 
@@ -286,7 +286,7 @@ static int ugman_indicator_update(enum ug_option opt, enum ug_event event)
        case UG_OPT_INDICATOR_MANUAL:
                return 0;
        default:
-               _ERR("ugman_indicator_update failed: Invalid opt\n");
+               _ERR("ugman_indicator_update failed: Invalid opt");
                return -1;
        }
 
@@ -443,13 +443,13 @@ static int ugman_ug_create(void *data)
 int ugman_ug_add(ui_gadget_h parent, ui_gadget_h ug)
 {
        if (!ug_man.is_initted) {
-               _ERR("ugman_ug_add failed: manager is not initted\n");
+               _ERR("ugman_ug_add failed: manager is not initted");
                return -1;
        }
 
        if (!ug_man.root) {
                if (parent) {
-                       _ERR("ugman_ug_add failed: parent has to be NULL w/o root\n");
+                       _ERR("ugman_ug_add failed: parent has to be NULL w/o root");
                        errno = EINVAL;
                        return -1;
                }
@@ -487,13 +487,13 @@ ui_gadget_h ugman_ug_load(ui_gadget_h parent,
 
        ug = calloc(1, sizeof(struct ui_gadget_s));
        if (!ug) {
-               _ERR("ug_create() failed: Memory allocation failed\n");
+               _ERR("ug_create() failed: Memory allocation failed");
                return NULL;
        }
 
        ug->module = ug_module_load(name);
        if (!ug->module) {
-               _ERR("ug_create() failed: Module loading failed\n");
+               _ERR("ug_create() failed: Module loading failed");
                goto load_fail;
        }
 
@@ -510,7 +510,7 @@ ui_gadget_h ugman_ug_load(ui_gadget_h parent,
 
        r = ugman_ug_add(parent, ug);
        if (r) {
-               _ERR("ug_create() failed: Tree update failed\n");
+               _ERR("ug_create() failed: Tree update failed");
                goto load_fail;
        }
 
@@ -552,23 +552,23 @@ int ugman_ug_del(ui_gadget_h ug)
        struct ug_engine_ops *eng_ops = NULL;
 
        if (!ug || !ugman_ug_exist(ug) || ug->state == UG_STATE_DESTROYED) {
-               _ERR("ugman_ug_del failed: Invalid ug\n");
+               _ERR("ugman_ug_del failed: Invalid ug");
                errno = EINVAL;
                return -1;
        }
 
        if (ug->destroy_me) {
-               _ERR("ugman_ug_del failed: ug is alreay on destroying\n");
+               _ERR("ugman_ug_del failed: ug is alreay on destroying");
                return -1;
        }
 
        if (!ug_man.is_initted) {
-               _ERR("ugman_ug_del failed: manager is not initted\n");
+               _ERR("ugman_ug_del failed: manager is not initted");
                return -1;
        }
 
        if (!ug_man.root) {
-               _ERR("ugman_ug_del failed: no root\n");
+               _ERR("ugman_ug_del failed: no root");
                return -1;
        }
 
@@ -593,12 +593,12 @@ int ugman_ug_del_all(void)
 {
        /*  Terminate */
        if (!ug_man.is_initted) {
-               _ERR("ugman_ug_del_all failed: manager is not initted\n");
+               _ERR("ugman_ug_del_all failed: manager is not initted");
                return -1;
        }
 
        if (!ug_man.root) {
-               _ERR("ugman_ug_del_all failed: no root\n");
+               _ERR("ugman_ug_del_all failed: no root");
                return -1;
        }
 
@@ -627,12 +627,12 @@ int ugman_resume(void)
 {
        /* RESUME */
        if (!ug_man.is_initted) {
-               _ERR("ugman_resume failed: manager is not initted\n");
+               _ERR("ugman_resume failed: manager is not initted");
                return -1;
        }
 
        if (!ug_man.root) {
-               _ERR("ugman_resume failed: no root\n");
+               _ERR("ugman_resume failed: no root");
                return -1;
        }
 
@@ -645,12 +645,12 @@ int ugman_pause(void)
 {
        /* PAUSE (Background) */
        if (!ug_man.is_initted) {
-               _ERR("ugman_pause failed: manager is not initted\n");
+               _ERR("ugman_pause failed: manager is not initted");
                return -1;
        }
 
        if (!ug_man.root) {
-               _ERR("ugman_pause failed: no root\n");
+               _ERR("ugman_pause failed: no root");
                return -1;
        }
 
@@ -676,7 +676,7 @@ int ugman_send_event(enum ug_event event)
 
        /* Propagate event */
        if (!ug_man.is_initted) {
-               _ERR("ugman_send_event failed: manager is not initted\n");
+               _ERR("ugman_send_event failed: manager is not initted");
                return -1;
        }
 

diff --git a/ug-efl-engine/ug-efl-engine.c b/ug-efl-engine/ug-efl-engine.c
index 97c9f838ddf13fa63fd2c74d2eee009b1f3587ca..31650e48b04ae6f39be96e98b7d50c9458a6bbf0 100755 (executable)
--- a/ug-efl-engine/ug-efl-engine.c
+++ b/ug-efl-engine/ug-efl-engine.c
@@ -47,8 +47,7 @@ static void _on_hideonly_cb(void *data, Evas_Object *obj)
        if (!ug)
                return;
 
-       _DBG("\t[%s][%d] obj=%p ug=%p state=%d\n", __FUNCTION__, __LINE__, obj,
-               ug, ug->layout_state);
+       _DBG("\t obj=%p ug=%p state=%d", obj, ug, ug->layout_state);
 
        evas_object_intercept_hide_callback_del(ug->layout, _on_hideonly_cb);
 
@@ -76,8 +75,7 @@ static void _del_effect_layout(ui_gadget_h ug)
        if (!ug)
                return;
 
-       _DBG("\t[%s][%d] ug=%p state=%d\n", __FUNCTION__, __LINE__, ug,
-               ug->layout_state);
+       _DBG("\t ug=%p state=%d", ug, ug->layout_state);
 
        evas_object_intercept_hide_callback_del(ug->layout, _on_hideonly_cb);
 
@@ -93,10 +91,9 @@ static void _del_effect_layout(ui_gadget_h ug)
        /* effect_layout of frameview is null */
        /* remove navi item */
        if (ug->effect_layout) {
-               _DBG("\t[%s][%d] remove navi tiem: ug=%p\n", __FUNCTION__,
-                       __LINE__,ug);
+               _DBG("\t remove navi tiem: ug=%p", ug);
                if (ug->layout_state == UG_LAYOUT_HIDEEFFECT) {
-                       _DBG("\t del cb, ug=%p\n", ug);
+                       _DBG("\t del cb, ug=%p", ug);
                        evas_object_smart_callback_del(navi, "transition,finished",
                                                        __hide_finished);
                }
@@ -108,7 +105,7 @@ static void _del_effect_layout(ui_gadget_h ug)
                Elm_Object_Item *t = elm_naviframe_top_item_get(navi);
                Elm_Object_Item *b = elm_naviframe_bottom_item_get(navi);
                if (t == b) {
-                       _DBG("\t[%s][%d]remove navi\n", __FUNCTION__, __LINE__);
+                       _DBG("\t remove navi");
                        evas_object_del(navi);
                        navi = NULL;
                }
@@ -127,8 +124,7 @@ static void __hide_finished(void *data, Evas_Object *obj, void *event_info)
                                        __hide_finished);
 
        ui_gadget_h ug = cb_d->ug;
-       _DBG("\t[%s][%d] obj=%p ug=%p state=%d\n", __FUNCTION__, __LINE__, obj,
-               ug, ug->layout_state);
+       _DBG("\t obj=%p ug=%p state=%d", obj, ug, ug->layout_state);
 
        ug->effect_layout = NULL;
        _del_effect_layout(ug);
@@ -163,8 +159,7 @@ static void on_destroy(ui_gadget_h ug, ui_gadget_h t_ug,
 
        if (!ug)
                return;
-       _DBG("\t[%s][%d] ug=%p tug=%p state=%d\n", __FUNCTION__, __LINE__, ug,
-               t_ug, ug->layout_state);
+       _DBG("\t ug=%p tug=%p state=%d", ug, t_ug, ug->layout_state);
 
        evas_object_intercept_hide_callback_del(ug->layout,
                                                _on_hideonly_cb);
@@ -181,7 +176,7 @@ static void on_destroy(ui_gadget_h ug, ui_gadget_h t_ug,
                cb_d->ug = ug;
                cb_d->hide_end_cb = hide_end_cb;
 
-               _DBG("\t[%s][%d]cb add ug=%p\n", __FUNCTION__, __LINE__, ug);
+               _DBG("\t cb add ug=%p", ug);
 
                evas_object_smart_callback_add(navi, "transition,finished",
                                        __hide_finished, cb_d);
@@ -204,8 +199,7 @@ static void __show_finished(void *data, Evas_Object *obj, void *event_info)
        ui_gadget_h ug = (ui_gadget_h) data;
        if (!ug)
                return;
-       _DBG("\t[%s][%d] obj=%p ug=%p state=%d\n", __FUNCTION__, __LINE__, obj,
-               ug, ug->layout_state);
+       _DBG("\t obj=%p ug=%p state=%d", obj, ug, ug->layout_state);
 
        evas_object_smart_callback_del(obj, "transition,finished",
                                        __show_finished);
@@ -225,8 +219,7 @@ static void on_show_cb(void *data, Evas *e, Evas_Object *obj,
        ui_gadget_h ug = (ui_gadget_h)data;
        if (!ug)
                return;
-       _DBG("\t[%s][%d] obj=%p ug=%p state=%d\n", __FUNCTION__, __LINE__, obj,
-               ug, ug->layout_state);
+       _DBG("\t obj=%p ug=%p state=%d", obj, ug, ug->layout_state);
 
        evas_object_intercept_hide_callback_add(ug->layout,
                                                _on_hideonly_cb, ug);
@@ -235,20 +228,19 @@ static void on_show_cb(void *data, Evas *e, Evas_Object *obj,
 
        if (ug->layout_state == UG_LAYOUT_HIDE
            || ug->layout_state == UG_LAYOUT_INIT) {
-               _DBG("\t UG_LAYOUT_Init obj=%p\n", obj);
+               _DBG("\t UG_LAYOUT_Init obj=%p", obj);
                ug->layout_state = UG_LAYOUT_SHOWEFFECT;
                evas_object_smart_callback_add(navi, "transition,finished",
                                                __show_finished, ug);
                ug->effect_layout = elm_naviframe_item_push(navi, NULL, NULL, NULL,
                                                    ug->layout, NULL);
        } else if (ug->layout_state == UG_LAYOUT_NOEFFECT) {
-               _DBG("\t UG_LAYOUT_NOEFFECT obj=%p\n", obj);
+               _DBG("\t UG_LAYOUT_NOEFFECT obj=%p", obj);
                Elm_Object_Item *navi_top = elm_naviframe_top_item_get(navi);
                ug->effect_layout = elm_naviframe_item_insert_after(navi,
                                navi_top, NULL, NULL, NULL, ug->layout, NULL);
        } else {
-               _ERR("\t [%s][%d] layout state error!! state=%d\n",
-                       __FUNCTION__, __LINE__, ug->layout_state);
+               _ERR("\t layout state error!! state=%d\n", ug->layout_state);
        }
 }
 
@@ -260,21 +252,19 @@ static void *on_create(void *win, ui_gadget_h ug)
        Evas_Object *con = NULL;
        static const char *ug_effect_edj_name = "/usr/share/edje/ug_effect.edj";
 
-       _DBG("[%s][%d] START==========>\n", __FUNCTION__, __LINE__);
-
        con = evas_object_data_get(win, "\377 elm,conformant");
        if (con) {
                conform = con;
-               _DBG("\t There is conformant\n");
+               _DBG("\t There is conformant");
        }
        else
-               _DBG("\t There is NO conformant\n");
+               _DBG("\t There is NO conformant");
 
        if (!navi) {
                navi = elm_naviframe_add(conform);
                elm_object_style_set(navi, "uglib");
                elm_naviframe_content_preserve_on_pop_set(navi, EINA_TRUE);
-               _DBG("\t new navi first navi=%p\n", navi);
+               _DBG("\t new navi first navi=%p", navi);
                elm_naviframe_prev_btn_auto_pushed_set(navi, EINA_FALSE);
 
                navi_bg = evas_object_rectangle_add(evas_object_evas_get(navi));