raster pushed a commit to branch master.
commit 5cef921aa4d8dd44f068db01c232ba8a1a442b48
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Tue Jul 23 21:56:02 2013 +0900
elm player - fix null icon set - forgot to tag button objects
---
src/lib/elc_player.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index f159a19..cdbdb3d 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -129,11 +129,15 @@ _update_theme_button(Evas_Object *obj, Evas_Object *bt,
const char *name)
{
Evas_Object *ic;
char buf[256];
-
+
+ if (!bt) return;
ic = evas_object_data_get(bt, "icon");
- snprintf(buf, sizeof(buf), "media_player/%s/%s", name,
- elm_widget_style_get(obj));
- elm_icon_standard_set(ic, buf);
+ if (ic)
+ {
+ snprintf(buf, sizeof(buf), "media_player/%s/%s", name,
+ elm_widget_style_get(obj));
+ elm_icon_standard_set(ic, buf);
+ }
snprintf(buf, sizeof(buf), "media_player/%s/%s", name,
elm_widget_style_get(obj));
elm_object_style_set(bt, buf);
@@ -147,7 +151,8 @@ static void
_update_theme_slider(Evas_Object *obj, Evas_Object *sl, const char *name)
{
char buf[256];
-
+
+ if (!sl) return;
snprintf(buf, sizeof(buf), "media_player/%s/%s", name,
elm_widget_style_get(obj));
elm_object_style_set(sl, buf);
@@ -411,6 +416,7 @@ _player_button_add(Evas_Object *obj,
elm_icon_standard_set(ic, buf);
bt = elm_button_add(obj);
+ if (ic) evas_object_data_set(bt, "icon", ic);
elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
elm_object_content_set(bt, ic);
evas_object_show(ic);
--
------------------------------------------------------------------------------
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
