cedric pushed a commit to branch master.
commit 847efe7cdbd96461b81214b445582dccfce2ae5b
Author: Cedric Bail <[email protected]>
Date: Wed Jul 24 15:49:39 2013 +0900
evas: let's return the correct file name.
---
src/lib/evas/canvas/evas_object_image.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index 49231d6..41cdc93 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -913,14 +913,20 @@ _image_source_events_get(Eo *eo_obj, void *_pd
EINA_UNUSED, va_list *list)
}
static void
-_dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
+_dbg_info_get(Eo *eo_obj, void *_pd, va_list *list)
{
+ Evas_Object_Image *o = _pd;
Eo_Dbg_Info *root = (Eo_Dbg_Info *) va_arg(*list, Eo_Dbg_Info *);
eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
const char *file, *key;
- eo_do(eo_obj, evas_obj_image_file_get(&file, &key));
+ if (o->cur->mmaped_source)
+ file = eina_file_filename_get(o->cur->u.f);
+ else
+ file = o->cur->u.file;
+ key = o->cur->key;
+
EO_DBG_INFO_APPEND(group, "Image File", EINA_VALUE_TYPE_STRING, file);
EO_DBG_INFO_APPEND(group, "Key", EINA_VALUE_TYPE_STRING, key);
EO_DBG_INFO_APPEND(group, "Source", EINA_VALUE_TYPE_UINT64,
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
