[EGIT] [enlightenment/modules/tclock] master 01/01: use elm label for popup

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/enlightenment/modules/tclock.git/commit/?id=eee6b70ec68d18096c319d4511e23bd060921e3e

commit eee6b70ec68d18096c319d4511e23bd060921e3e
Author: Daniel Kolesa <d.kol...@samsung.com>
Date:   Mon Jan 26 17:32:41 2015 +0000

    use elm label for popup
---
 src/e_mod_main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index e8d58be..c3f7398 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -24,7 +24,7 @@ static const char *_gc_id_new(const E_Gadcon_Client_Class 
*client_class __UNUSED
 
 /* Module Protos */
 static void _tclock_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object 
*obj __UNUSED__, void *event_info);
-static void _tclock_cb_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object 
*obj __UNUSED__, void *event_info __UNUSED__);
+static void _tclock_cb_mouse_in(void *data, Evas *e, Evas_Object *obj 
__UNUSED__, void *event_info __UNUSED__);
 static void _tclock_cb_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object 
*obj __UNUSED__, void *event_info __UNUSED__);
 static void _tclock_menu_cb_configure(void *data, E_Menu *m __UNUSED__, 
E_Menu_Item *mi __UNUSED__);
 static void _tclock_menu_cb_post(void *data __UNUSED__, E_Menu *m __UNUSED__);
@@ -195,7 +195,7 @@ _tclock_cb_mouse_down(void *data, Evas *e __UNUSED__, 
Evas_Object *obj __UNUSED_
 }
 
 static void 
-_tclock_cb_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj 
__UNUSED__, void *event_info __UNUSED__) 
+_tclock_cb_mouse_in(void *data, Evas *e, Evas_Object *obj __UNUSED__, void 
*event_info __UNUSED__) 
 {
    Instance *inst = NULL;
    char buf[1024];
@@ -212,7 +212,8 @@ _tclock_cb_mouse_in(void *data, Evas *e __UNUSED__, 
Evas_Object *obj __UNUSED__,
    local_time = localtime(&current_time);
    memset(buf, 0, sizeof(buf));
    strftime(buf, 1024, inst->ci->tip_format, local_time);
-   inst->o_tip = e_widget_label_add(e_comp_get(inst->tip)->evas, buf);
+   inst->o_tip = elm_label_add(e_win_evas_win_get(e));
+   elm_object_text_set(inst->o_tip, buf);
 
    e_gadcon_popup_content_set(inst->tip, inst->o_tip);
    e_gadcon_popup_show(inst->tip);
@@ -318,7 +319,7 @@ _tclock_cb_check(void *data __UNUSED__)
        if ((inst->ci->tip_format) && (inst->o_tip))
          {
              strftime(buf, 1024, inst->ci->tip_format, local_time);
-            e_widget_label_text_set(inst->o_tip, buf);
+         elm_object_text_set(inst->o_tip, buf);
          }
      }
 

--