[EGIT] [enlightenment/modules/penguins] master 01/01: Fix for recent e20 changes

[Dave Andreoli]

davemds pushed a commit to branch master.

http://git.enlightenment.org/enlightenment/modules/penguins.git/commit/?id=085530210fd3aadd26cf530251bbaf8363241d9a

commit 085530210fd3aadd26cf530251bbaf8363241d9a
Author: Dave Andreoli <d...@gurumeditation.it>
Date:   Sat Mar 21 13:26:01 2015 +0100

    Fix for recent e20 changes
---
 src/e_mod_penguins.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/e_mod_penguins.c b/src/e_mod_penguins.c
index a475749..dec0ba3 100644
--- a/src/e_mod_penguins.c
+++ b/src/e_mod_penguins.c
@@ -292,7 +292,7 @@ _population_load(void)
       {
          zones = eina_list_append(zones, zone);
          printf("PENGUINS:   Zone: %s - %s || %d,%d @ %dx%d\n",
-                zone->comp->name, zone->name, zone->x, zone->y, zone->w, 
zone->h);
+                e_comp->name, zone->name, zone->x, zone->y, zone->w, zone->h);
       }
    #else
       E_Comp *comp;
@@ -316,7 +316,11 @@ _population_load(void)
       if (!tux) return;
 
       tux->zone = eina_list_nth(zones, i % eina_list_count(zones));
+#if E_VERSION_MAJOR == 20
+      tux->obj = edje_object_add(e_comp->evas);
+#else
       tux->obj = edje_object_add(tux->zone->comp->evas);
+#endif
       edje_object_file_set(tux->obj, population->conf->theme, "anims");
       evas_object_color_set(tux->obj, population->conf->alpha, 
population->conf->alpha,
                                       population->conf->alpha, 
population->conf->alpha);
@@ -586,8 +590,11 @@ static int
 _is_inside_any_win(Penguins_Actor *tux, int x, int y, int ret_value)
 {
    Evas_Object *o;
-
+#if E_VERSION_MAJOR == 20
+   o = evas_object_top_get(e_comp->evas);
+#else
    o = evas_object_top_get(tux->zone->comp->evas);
+#endif
    while (o)
    {
       int xx, yy, ww, hh;

--