Renamed global variable evas to G_evas.

100 files changed, 137 insertions, 137 deletions

diff --git a/src/bin/about.c b/src/bin/about.c
index 10f6949..67b0721 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -8,7 +8,7 @@ _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
    eo_do(o, evas_obj_position_set(10, 40),
          evas_obj_size_set(win_w - 20, win_h - 50),
          evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/font_effect_blur_alpha.c b/src/bin/font_effect_blur_alpha.c
index 8f812c9..c49ff47 100644
--- a/src/bin/font_effect_blur_alpha.c
+++ b/src/bin/font_effect_blur_alpha.c
@@ -28,7 +28,7 @@ static void _setup(void)
    Evas_Object *o;
    int w,h;
 
-   o = evas_object_text_add(evas);
+   o = evas_object_text_add(G_evas);
    evas_object_color_set(o, 0, 0, 0, 255);
    evas_object_text_font_set(o, "Vera-Bold", 80);
    evas_object_text_text_set(o, "Font Effect");
diff --git a/src/bin/font_effect_blur_color.c b/src/bin/font_effect_blur_color.c
index 875f440..385b554 100644
--- a/src/bin/font_effect_blur_color.c
+++ b/src/bin/font_effect_blur_color.c
@@ -30,7 +30,7 @@ static void _setup(void)
    Evas_Object *o;
    int w, h;
 
-   o = evas_object_text_add(evas);
+   o = G_evas_object_text_add(evas);
    evas_object_color_set(o, 0, 0, 0, 255);
    evas_object_text_font_set(o, "Vera-Bold", 80);
    evas_object_text_text_set(o, "Font Effect");
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 4cc7de8..a7b759c 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("bar.png"), NULL),
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index f8a7863..8776e50 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("pan.png"), NULL),
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index ddfae29..b7a9035 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index a6a476a..c8a9bcb 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -24,7 +24,7 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         a = rnd()&0xff;
         eo_do(o,
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index 571c388..2695b8f 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < MANYNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         n = rnd() % 100;
         w = 3 + ((n * (60 - 3)) / 100);
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index c70f20b..2845b0e 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 95ce610..9255a84 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index b979feb..7b31fbc 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 41c8f35..a990f84 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index 3510450..6830ee4 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index a454eff..0519669 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 9beef4e..669e9eb 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index b918d54..7c0a55a 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 5f0f425..1686422 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 1699edd..15ea683 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index 264ebe7..715580f 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 7306698..2bab38c 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index f083a7b..8f6cc99 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 076fd0b..919369a 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index 1e34dbc..1cd214f 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 4cce7f8..5380a1a 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index ac28e68..c18d2cd 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index b96b911..ab40f80 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 783a648..529ef89 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index 654995f..af039c3 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 69cf05c..6b1f77e 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("frame.png"), NULL),
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 8215814..1967554 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index 1815177..bb09de2 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index c7fe4da..350d837 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("bar.png"), NULL),
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index 2e5fa59..d0cfcb1 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 73f3b00..2263d76 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index f12974e..fb0f575 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 2159cb1..c26c4c6 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -22,7 +22,7 @@ static void _setup(void)
 {
    Evas_Object *o;
 
-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, G_evas);
    o_images[0] = o;
    eo_do(o,
          efl_file_set(build_path("im1.png"), NULL),
@@ -30,7 +30,7 @@ static void _setup(void)
          evas_obj_size_set(720, 420),
          evas_obj_visibility_set(EINA_TRUE));
 
-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, G_evas);
    o_images[1] = o;
    eo_do(o,
          efl_file_set(build_path("im2.png"), NULL),
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index d868867..f65f48c 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 541eb1b..22c0ac1 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index d06689a..7bc9548 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
index 2800955..c892cd3 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 26a00a1..eeaf785 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index 1025622..71488a2 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 803e4b1..c61e43a 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         eo_do(o,
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index 29e2229..21351da 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         eo_do(o,
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index 4b2d471..4a6c2cb 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         eo_do(o,
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index 323d35f..964fb4b 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         eo_do(o,
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index cb1f5f6..ac931eb 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         eo_do(o,
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index 8954c02..99e7d10 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         eo_do(o,
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index f2cdf7a..0120c9d 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
         char buf[256];
 
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         eo_do(o,
@@ -39,7 +39,7 @@ static void _setup(void)
               efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_reflec[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         eo_do(o,
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index a27addd..e048cad 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index 1f8f27b..a2042cb 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 40d1f49..4b6a01f 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 7552048..d2c3224 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index c09ae09..45aa0e0 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index e7fcf7c..77f6baf 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 7f4969a..d83b7a3 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 8040da3..932e3ee 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index 7c98d1f..4f93f39 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 0a37dd4..e384087 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 58cad97..462fe3a 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, efl_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index 104dd4d..3bdaf11 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 9f9b775..e038f3a 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, efl_file_set(build_path("tp.png"), NULL),
                  evas_obj_image_fill_set(0, 0, 640, 480),
diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c
index 9ee5e18..6f5d51f 100644
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EVAS_LINE_CLASS, evas);
+        o = eo_add(EVAS_LINE_CLASS, G_evas);
         o_images[i] = o;
         a = (rnd()&0xff) / 2;
         r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/main.c b/src/bin/main.c
index 0f90ee7..dd74c3b 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -4,7 +4,7 @@
 #include <Ecore_Evas.h>
 #include <Ecore.h>
 
-Evas *evas = NULL;
+Evas *G_evas = NULL;
 const char *profile = "n800";
 const char *choosen_engine = NULL;
 int win_w = 720, win_h = 420;
@@ -1294,10 +1294,10 @@ main(int argc, char **argv)
    ecore_evas_callback_delete_request_set(ee, _cb_delete);
    ecore_evas_callback_post_render_set(ee, _cb_post_render);
 
-   evas = ecore_evas_get(ee);
+   G_evas = ecore_evas_get(ee);
 
-   evas_font_path_append(evas, datadir);
-   evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO);
+   evas_font_path_append(G_evas, datadir);
+   evas_font_hinting_set(G_evas, EVAS_FONT_HINTING_AUTO);
 
    ui_setup(resolutions[resolution_index].width,
             resolutions[resolution_index].height);
diff --git a/src/bin/main.h b/src/bin/main.h
index 5a99c44..e8ac673 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -44,7 +44,7 @@ extern "C"
 #define OBNUM 128
 #define LOOPS 128
 
-extern Evas *evas;
+extern Evas *G_evas;
 extern int   win_w, win_h;
 extern int   loops;
 extern const char *choosen_engine;
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index 5aa8340..6af8e7c 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -73,7 +73,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EVAS_POLYGON_CLASS, evas);
+        o = eo_add(EVAS_POLYGON_CLASS, G_evas);
         o_images[i] = o;
         a = (rnd()&0xff) / 2;
         r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index a768c50..f7e51f9 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -22,7 +22,7 @@ static void _setup(void)
    int i;
    Evas_Object *o,*src;
 
-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, G_evas);
    eo_do(o,
          efl_file_set(build_path("logo.png"), NULL),
          evas_obj_image_fill_set(0, 0, 120, 160),
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 1; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o,
               evas_obj_image_source_set(src),
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index 45b4f2c..e876486 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -26,7 +26,7 @@ static void _setup(void)
    int i;
    Evas_Object *o,*src;
 
-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, G_evas);
    eo_do(o, efl_file_set(build_path("logo.png"), NULL),
          evas_obj_image_fill_set(0, 0, 120, 160),
          evas_obj_size_set(120, 160),
@@ -35,7 +35,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM / 2; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_source_set(src, NULL),
               evas_obj_size_set(120, 160),
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 8443e4b..0e29eb3 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -27,7 +27,7 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
      {
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o,
               efl_text_properties_font_set("Vera-Bold", 20),
@@ -46,7 +46,7 @@ static void _setup(void)
    for (  ; i < OBNUM ; i ++)
      {
         s = o_texts[i % st];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, evas_obj_image_source_set(s));
         /* FIXME s == NULL*/
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 81105f5..85c5821 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -30,7 +30,7 @@ static void _setup(void)
         "Fiddly", "Family", "Lair", "Monkeys", "Magazine"
    };
    srnd();
-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, G_evas);
    o_texts[0] = o;
    snprintf(buf, sizeof(buf), "%s %s %s %s.",
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
@@ -52,7 +52,7 @@ static void _setup(void)
          evas_obj_visibility_set(EINA_TRUE));
    for (i = 1  ; i < OBNUM ; i ++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o,
               evas_obj_image_source_set(o_texts[0]));
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index 2a24694..06f3644 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+        o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
         o_images[i] = o;
         a = rnd()&0xff;
         r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index 15985b4..9ceb71b 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+        o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
         o_images[i] = o;
         a = rnd()&0xff;
         r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index f4df639..5d34a52 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+        o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
         o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index 465bd82..53d0e9e 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+        o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
         o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index 071bdf4..a4df617 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+        o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
         o_images[i] = o;
         a = 0xff;
         r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 917a96c..ebfd495 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+        o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
         o_images[i] = o;
         a = 0xff;
         r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index be51708..692c3d7 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -25,7 +25,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 20),
               efl_text_set("This is a test string"),
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index 25db3cf..c4e880d 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -32,7 +32,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 5d5fc25..3460812 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -27,7 +27,7 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o,
               efl_text_properties_font_set("Vera-Bold", 20),
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 187c0f5..ffc3b63 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -34,7 +34,7 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index c0ec4ce..bc6c4dc 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index c3841c8..fee4518 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index 7559599..e96935c 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index 4daa8cf..1e38d2a 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/ui.c b/src/bin/ui.c
index bffc831..69b04f4 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -360,7 +360,7 @@ _ui_menu_item_full_add(Eina_Bool test,
    Menu_Item *mi;
 
    mi = malloc(sizeof(Menu_Item));
-   mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas);
+   mi->o_icon = eo_add(EVAS_IMAGE_CLASS, G_evas);
    eo_unref(mi->o_icon);
    eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL),
          evas_obj_size_set(32, 32),
@@ -390,7 +390,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    win_w = ui_w;
    win_h = ui_h;
 
-   o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
    eo_unref(o);
    eo_do(o, evas_obj_position_set(0, 0),
          evas_obj_size_set(win_w, win_h),
@@ -401,7 +401,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
          eo_event_callback_array_add(ui_callbacks(), NULL));
    o_bg = o;
 
-   o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
    eo_unref(o);
    eo_do(o, evas_obj_position_set(0, 0),
          evas_obj_size_set(win_w, win_h),
@@ -410,7 +410,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
          evas_obj_visibility_set(EINA_TRUE));
    o_wallpaper = o;
 
-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, G_evas);
    eo_unref(o);
    eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
          efl_text_set("EXPEDITE"),
@@ -424,7 +424,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
          evas_obj_visibility_set(EINA_TRUE));
    o_title = o;
 
-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, G_evas);
    eo_unref(o);
    eo_do(o, efl_text_properties_font_set("Vera", 9),
          efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
@@ -438,7 +438,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
          evas_obj_visibility_set(EINA_TRUE));
    o_byline = o;
 
-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, G_evas);
    eo_unref(o);
    eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
          efl_file_set(build_path("e-logo.png"), NULL),
@@ -449,7 +449,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
          evas_obj_visibility_set(EINA_TRUE));
    o_menu_logo = o;
 
-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, G_evas);
    eo_unref(o);
    eo_do(o, evas_obj_position_set(win_w - 128, - 128),
          evas_obj_image_fill_set(0, 0, 256, 256),
@@ -457,7 +457,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
          evas_obj_visibility_set(EINA_TRUE));
    o_menu_icon = o;
 
-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, G_evas);
    eo_unref(o);
    eo_do(o, evas_obj_position_set(0, 0),
          efl_file_set(build_path("icon_sel.png"), NULL),
@@ -465,7 +465,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
          evas_obj_image_fill_set(0, 0, 48, 48));
    o_menu_icon_sel = o;
 
-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, G_evas);
    eo_unref(o);
    eo_do(o, evas_obj_position_set(0, 0),
          efl_file_set(build_path("text_sel.png"), NULL),
@@ -474,7 +474,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
          evas_obj_image_border_set(7, 7, 7, 7));
    o_menu_text_sel = o;
 
-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, G_evas);
    eo_unref(o);
    eo_do(o, efl_text_properties_font_set("Vera", 10),
          efl_text_set(""),
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index 6805d3d..34e3d1f 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
                    evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                    evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                    evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(icons[i % 13]),
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index b3e2c0e..82ed0cc 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(icons[i % 13]),
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index 0c35a9b..41e53ba 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
               efl_text_set(icons[i % 13]),
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index 983b0d8..a4e9756 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -31,14 +31,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(icons[i % 1]),
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index 23405be..e3a8ffb 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -31,14 +31,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(icons[i % 1]),
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index 86f71aa..2ee74ed 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(icons[i % 13]),
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index b186f43..7558807 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(icons[i % 13]),
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 546ee90..dd7066e 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index 5c4449d..93c1d83 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index 7c5875f..9a93e1c 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index 08de68d..b9ea16b 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index 0f0049f..c655b84 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index aaf5f39..28b92b7 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index 2211c17..a624af9 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 381b887..9b3166f 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, G_evas);
         o_texts[i] = o;
         eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
                  efl_text_set(labels[i % 26]),