[EGIT] [apps/express] master 02/03: express: Rename url handlers

[Chris Michael]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/apps/express.git/commit/?id=ca1e9c87c7b9ba400e4b983a97129ed280a9def6

commit ca1e9c87c7b9ba400e4b983a97129ed280a9def6
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Mon Aug 3 14:28:33 2015 -0400

    express: Rename url handlers
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 src/bin/media.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/bin/media.c b/src/bin/media.c
index 6c011df..4333463 100644
--- a/src/bin/media.c
+++ b/src/bin/media.c
@@ -18,7 +18,7 @@ struct _Media
    Evas_Object *o_tmp;
 
    Ecore_Con_Url *url;
-   Ecore_Event_Handler *_prog_hdlr, *_compl_hdlr;
+   Ecore_Event_Handler *url_prog_hdlr, *url_compl_hdlr;
    Ethumb_Client_Async *et_req;
 
    const char *src, *ext, *realf;
@@ -659,11 +659,11 @@ _media_cb_compl(void *data, int type EINA_UNUSED, void 
*event)
    if (ev->url_con != sd->url) return EINA_TRUE;
 
    edje_object_signal_emit(sd->o_busy, "done", PACKAGE_NAME);
-   ecore_event_handler_del(sd->_prog_hdlr);
-   ecore_event_handler_del(sd->_compl_hdlr);
+   ecore_event_handler_del(sd->url_prog_hdlr);
+   ecore_event_handler_del(sd->url_compl_hdlr);
    ecore_con_url_free(sd->url);
-   sd->_prog_hdlr = NULL;
-   sd->_compl_hdlr = NULL;
+   sd->url_prog_hdlr = NULL;
+   sd->url_compl_hdlr = NULL;
    sd->url = NULL;
 
    switch (sd->type)
@@ -718,13 +718,13 @@ _smart_del(Evas_Object *obj)
      emotion_object_last_position_save(sd->o_img);
    if (sd->url)
      {
-        ecore_event_handler_del(sd->_prog_hdlr);
-        ecore_event_handler_del(sd->_compl_hdlr);
+        ecore_event_handler_del(sd->url_prog_hdlr);
+        ecore_event_handler_del(sd->url_compl_hdlr);
         ecore_con_url_free(sd->url);
      }
 
-   sd->_prog_hdlr = NULL;
-   sd->_compl_hdlr = NULL;
+   sd->url_prog_hdlr = NULL;
+   sd->url_compl_hdlr = NULL;
    sd->url = NULL;
 
    if (sd->tmpfd >= 0)
@@ -941,7 +941,8 @@ _media_add(Evas_Object *parent, const char *src, int mode, 
Media_Type type)
                          }
                        else
                          {
-                            sd->o_busy = 
edje_object_add(evas_object_evas_get(obj));
+                            sd->o_busy =
+                              edje_object_add(evas_object_evas_get(obj));
                             evas_object_smart_member_add(sd->o_busy, obj);
                             _theme_apply(sd->o_busy, "express/mediabusy");
                             evas_object_show(sd->o_busy);
@@ -949,13 +950,12 @@ _media_add(Evas_Object *parent, const char *src, int 
mode, Media_Type type)
                                                     PACKAGE_NAME);
 
                             sd->realf = eina_stringshare_add(path);
-                            sd->_prog_hdlr = 
+                            sd->url_prog_hdlr = 
                               
ecore_event_handler_add(ECORE_CON_EVENT_URL_PROGRESS,
                                                       _media_cb_prog, obj);
-                            sd->_compl_hdlr = 
+                            sd->url_compl_hdlr = 
                               
ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE,
                                                       _media_cb_compl, obj);
-
                          }
                     }
 

--