summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio Sena <savio.sena@acm.org>2014-08-24 07:48:43 -0300
committerSavio Sena <savio@expertisesolutions.com.br>2014-09-16 19:35:17 -0300
commite4c333f3eb7fcbef7f0e6615c4e2b03808db801d (patch)
tree1cdc2eea2d96a94d46e729da0aceb197dc76cee3
parentf0dbeca426a092d88bb2fa1d434bb14f5d9875d9 (diff)
Renamed global variable evas to G_evas.
-rw-r--r--src/bin/about.c2
-rw-r--r--src/bin/font_effect_blur_alpha.c2
-rw-r--r--src/bin/font_effect_blur_color.c2
-rw-r--r--src/bin/image_blend_border.c2
-rw-r--r--src/bin/image_blend_border_recolor.c2
-rw-r--r--src/bin/image_blend_fade_pow2_unscaled.c2
-rw-r--r--src/bin/image_blend_fade_unscaled.c2
-rw-r--r--src/bin/image_blend_many_smooth_same_scaled.c2
-rw-r--r--src/bin/image_blend_nearest_same_scaled.c2
-rw-r--r--src/bin/image_blend_nearest_scaled.c2
-rw-r--r--src/bin/image_blend_nearest_solid_same_scaled.c2
-rw-r--r--src/bin/image_blend_nearest_solid_scaled.c2
-rw-r--r--src/bin/image_blend_occlude1.c2
-rw-r--r--src/bin/image_blend_occlude1_few.c2
-rw-r--r--src/bin/image_blend_occlude1_many.c2
-rw-r--r--src/bin/image_blend_occlude1_very_many.c2
-rw-r--r--src/bin/image_blend_occlude2.c2
-rw-r--r--src/bin/image_blend_occlude2_few.c2
-rw-r--r--src/bin/image_blend_occlude2_many.c2
-rw-r--r--src/bin/image_blend_occlude2_very_many.c2
-rw-r--r--src/bin/image_blend_occlude3.c2
-rw-r--r--src/bin/image_blend_occlude3_few.c2
-rw-r--r--src/bin/image_blend_occlude3_many.c2
-rw-r--r--src/bin/image_blend_occlude3_very_many.c2
-rw-r--r--src/bin/image_blend_smooth_same_scaled.c2
-rw-r--r--src/bin/image_blend_smooth_scaled.c2
-rw-r--r--src/bin/image_blend_smooth_solid_same_scaled.c2
-rw-r--r--src/bin/image_blend_smooth_solid_scaled.c2
-rw-r--r--src/bin/image_blend_solid_border.c2
-rw-r--r--src/bin/image_blend_solid_fade_pow2_unscaled.c2
-rw-r--r--src/bin/image_blend_solid_fade_unscaled.c2
-rw-r--r--src/bin/image_blend_solid_middle_border.c2
-rw-r--r--src/bin/image_blend_solid_middle_unscaled.c2
-rw-r--r--src/bin/image_blend_solid_unscaled.c2
-rw-r--r--src/bin/image_blend_unscaled.c2
-rw-r--r--src/bin/image_crossfade.c4
-rw-r--r--src/bin/image_data_argb.c2
-rw-r--r--src/bin/image_data_argb_alpha.c2
-rw-r--r--src/bin/image_data_ycbcr601pl.c2
-rw-r--r--src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c2
-rw-r--r--src/bin/image_data_ycbcr601pl_map_solid_rotate.c2
-rw-r--r--src/bin/image_data_ycbcr601pl_wide_stride.c2
-rw-r--r--src/bin/image_map_3d_1.c2
-rw-r--r--src/bin/image_map_3d_2.c2
-rw-r--r--src/bin/image_map_3d_3.c2
-rw-r--r--src/bin/image_map_3d_4.c2
-rw-r--r--src/bin/image_map_3d_5.c2
-rw-r--r--src/bin/image_map_3d_6.c2
-rw-r--r--src/bin/image_map_3d_flow.c4
-rw-r--r--src/bin/image_map_color_alpha_nearest_rotate.c2
-rw-r--r--src/bin/image_map_color_alpha_nearest_solid_rotate.c2
-rw-r--r--src/bin/image_map_color_alpha_rotate.c2
-rw-r--r--src/bin/image_map_color_alpha_solid_rotate.c2
-rw-r--r--src/bin/image_map_color_nearest_rotate.c2
-rw-r--r--src/bin/image_map_color_nearest_solid_rotate.c2
-rw-r--r--src/bin/image_map_color_rotate.c2
-rw-r--r--src/bin/image_map_color_solid_rotate.c2
-rw-r--r--src/bin/image_map_nearest_rotate.c2
-rw-r--r--src/bin/image_map_nearest_solid_rotate.c2
-rw-r--r--src/bin/image_map_rotate.c2
-rw-r--r--src/bin/image_map_solid_rotate.c2
-rw-r--r--src/bin/image_quality_scale.c2
-rw-r--r--src/bin/line_blend.c2
-rw-r--r--src/bin/main.c8
-rw-r--r--src/bin/main.h2
-rw-r--r--src/bin/poly_blend.c2
-rw-r--r--src/bin/proxy_image.c4
-rw-r--r--src/bin/proxy_image_offscreen.c4
-rw-r--r--src/bin/proxy_text_fixed.c4
-rw-r--r--src/bin/proxy_text_random.c4
-rw-r--r--src/bin/rect_blend.c2
-rw-r--r--src/bin/rect_blend_few.c2
-rw-r--r--src/bin/rect_blend_pow2.c2
-rw-r--r--src/bin/rect_blend_pow2_few.c2
-rw-r--r--src/bin/rect_solid.c2
-rw-r--r--src/bin/rect_solid_few.c2
-rw-r--r--src/bin/text_basic.c2
-rw-r--r--src/bin/text_change.c2
-rw-r--r--src/bin/text_styles.c2
-rw-r--r--src/bin/text_styles_different_strings.c2
-rw-r--r--src/bin/textblock_auto_align.c2
-rw-r--r--src/bin/textblock_basic.c2
-rw-r--r--src/bin/textblock_intl.c2
-rw-r--r--src/bin/textblock_text_append.c2
-rw-r--r--src/bin/ui.c20
-rw-r--r--src/bin/widgets_file_icons.c4
-rw-r--r--src/bin/widgets_file_icons_2.c4
-rw-r--r--src/bin/widgets_file_icons_2_grouped.c4
-rw-r--r--src/bin/widgets_file_icons_2_same.c4
-rw-r--r--src/bin/widgets_file_icons_2_same_grouped.c4
-rw-r--r--src/bin/widgets_file_icons_3.c4
-rw-r--r--src/bin/widgets_file_icons_4.c4
-rw-r--r--src/bin/widgets_list_1.c4
-rw-r--r--src/bin/widgets_list_1_grouped.c4
-rw-r--r--src/bin/widgets_list_2.c4
-rw-r--r--src/bin/widgets_list_2_grouped.c4
-rw-r--r--src/bin/widgets_list_3.c6
-rw-r--r--src/bin/widgets_list_3_grouped.c6
-rw-r--r--src/bin/widgets_list_4.c6
-rw-r--r--src/bin/widgets_list_4_grouped.c6
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)
8 Evas_Object *o; 8 Evas_Object *o;
9 Evas_Textblock_Style *st; 9 Evas_Textblock_Style *st;
10 10
11 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 11 o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
12 eo_do(o, evas_obj_position_set(10, 40), 12 eo_do(o, evas_obj_position_set(10, 40),
13 evas_obj_size_set(win_w - 20, win_h - 50), 13 evas_obj_size_set(win_w - 20, win_h - 50),
14 evas_obj_visibility_set(EINA_TRUE)); 14 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)
28 Evas_Object *o; 28 Evas_Object *o;
29 int w,h; 29 int w,h;
30 30
31 o = evas_object_text_add(evas); 31 o = evas_object_text_add(G_evas);
32 evas_object_color_set(o, 0, 0, 0, 255); 32 evas_object_color_set(o, 0, 0, 0, 255);
33 evas_object_text_font_set(o, "Vera-Bold", 80); 33 evas_object_text_font_set(o, "Vera-Bold", 80);
34 evas_object_text_text_set(o, "Font Effect"); 34 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)
30 Evas_Object *o; 30 Evas_Object *o;
31 int w, h; 31 int w, h;
32 32
33 o = evas_object_text_add(evas); 33 o = G_evas_object_text_add(evas);
34 evas_object_color_set(o, 0, 0, 0, 255); 34 evas_object_color_set(o, 0, 0, 0, 255);
35 evas_object_text_font_set(o, "Vera-Bold", 80); 35 evas_object_text_font_set(o, "Vera-Bold", 80);
36 evas_object_text_text_set(o, "Font Effect"); 36 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("bar.png"), NULL), 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("pan.png"), NULL), 29 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)
25 { 25 {
26 int a; 26 int a;
27 27
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 eo_do(o,
31 efl_file_set(build_path("logo.png"), NULL), 31 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)
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 int a; 26 int a;
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 a = rnd()&0xff; 29 a = rnd()&0xff;
30 eo_do(o, 30 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)
25 Evas_Object *o; 25 Evas_Object *o;
26 for (i = 0; i < MANYNUM; i++) 26 for (i = 0; i < MANYNUM; i++)
27 { 27 {
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 n = rnd() % 100; 30 n = rnd() % 100;
31 w = 3 + ((n * (60 - 3)) / 100); 31 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 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)
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i < (OBNUM / 2)) 29 if (i < (OBNUM / 2))
30 { 30 {
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)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
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)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
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)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
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)
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i & 0x1) 29 if (i & 0x1)
30 { 30 {
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)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
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)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
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)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
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)
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i > (OBNUM / 2)) 29 if (i > (OBNUM / 2))
30 { 30 {
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)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
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)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
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)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("frame.png"), NULL), 29 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)
25 { 25 {
26 int a; 26 int a;
27 27
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 eo_do(o,
31 efl_file_set(build_path("image.png"), NULL), 31 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)
25 { 25 {
26 int a; 26 int a;
27 27
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 eo_do(o,
31 efl_file_set(build_path("image.png"), NULL), 31 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("bar.png"), NULL), 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 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)
22{ 22{
23 Evas_Object *o; 23 Evas_Object *o;
24 24
25 o = eo_add(EVAS_IMAGE_CLASS, evas); 25 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
26 o_images[0] = o; 26 o_images[0] = o;
27 eo_do(o, 27 eo_do(o,
28 efl_file_set(build_path("im1.png"), NULL), 28 efl_file_set(build_path("im1.png"), NULL),
@@ -30,7 +30,7 @@ static void _setup(void)
30 evas_obj_size_set(720, 420), 30 evas_obj_size_set(720, 420),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 32
33 o = eo_add(EVAS_IMAGE_CLASS, evas); 33 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
34 o_images[1] = o; 34 o_images[1] = o;
35 eo_do(o, 35 eo_do(o,
36 efl_file_set(build_path("im2.png"), NULL), 36 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < 1; i++) 25 for (i = 0; i < 1; i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < 1; i++) 25 for (i = 0; i < 1; i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 30 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)
27 Evas_Object *o; 27 Evas_Object *o;
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 eo_do(o, 32 eo_do(o,
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 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)
27 Evas_Object *o; 27 Evas_Object *o;
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 eo_do(o, 32 eo_do(o,
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 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)
27 Evas_Object *o; 27 Evas_Object *o;
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 eo_do(o, 32 eo_do(o,
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 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)
27 Evas_Object *o; 27 Evas_Object *o;
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 eo_do(o, 32 eo_do(o,
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 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)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 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)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 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)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 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)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 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)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 eo_do(o, 60 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)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 eo_do(o, 60 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)
29 { 29 {
30 char buf[256]; 30 char buf[256];
31 31
32 o = eo_add(EVAS_IMAGE_CLASS, evas); 32 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
33 o_images[i] = o; 33 o_images[i] = o;
34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
35 eo_do(o, 35 eo_do(o,
@@ -39,7 +39,7 @@ static void _setup(void)
39 efl_image_smooth_scale_set(0), 39 efl_image_smooth_scale_set(0),
40 evas_obj_visibility_set(EINA_TRUE)); 40 evas_obj_visibility_set(EINA_TRUE));
41 41
42 o = eo_add(EVAS_IMAGE_CLASS, evas); 42 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
43 o_reflec[i] = o; 43 o_reflec[i] = o;
44 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 44 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
45 eo_do(o, 45 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("logo.png"), NULL), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("logo.png"), NULL), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("logo.png"), NULL), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("logo.png"), NULL), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("logo.png"), NULL), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, efl_file_set(build_path("logo.png"), NULL), 29 eo_do(o, efl_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 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)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < 1; i++) 25 for (i = 0; i < 1; i++)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, efl_file_set(build_path("tp.png"), NULL), 29 eo_do(o, efl_file_set(build_path("tp.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 640, 480), 30 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)
26 { 26 {
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EVAS_LINE_CLASS, evas); 29 o = eo_add(EVAS_LINE_CLASS, G_evas);
30 o_images[i] = o; 30 o_images[i] = o;
31 a = (rnd()&0xff) / 2; 31 a = (rnd()&0xff) / 2;
32 r = ((rnd()&0xff) * a) / 255; 32 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 @@
4#include <Ecore_Evas.h> 4#include <Ecore_Evas.h>
5#include <Ecore.h> 5#include <Ecore.h>
6 6
7Evas *evas = NULL; 7Evas *G_evas = NULL;
8const char *profile = "n800"; 8const char *profile = "n800";
9const char *choosen_engine = NULL; 9const char *choosen_engine = NULL;
10int win_w = 720, win_h = 420; 10int win_w = 720, win_h = 420;
@@ -1294,10 +1294,10 @@ main(int argc, char **argv)
1294 ecore_evas_callback_delete_request_set(ee, _cb_delete); 1294 ecore_evas_callback_delete_request_set(ee, _cb_delete);
1295 ecore_evas_callback_post_render_set(ee, _cb_post_render); 1295 ecore_evas_callback_post_render_set(ee, _cb_post_render);
1296 1296
1297 evas = ecore_evas_get(ee); 1297 G_evas = ecore_evas_get(ee);
1298 1298
1299 evas_font_path_append(evas, datadir); 1299 evas_font_path_append(G_evas, datadir);
1300 evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); 1300 evas_font_hinting_set(G_evas, EVAS_FONT_HINTING_AUTO);
1301 1301
1302 ui_setup(resolutions[resolution_index].width, 1302 ui_setup(resolutions[resolution_index].width,
1303 resolutions[resolution_index].height); 1303 resolutions[resolution_index].height);
diff --git a/src/bin/main.h b/src/bin/main.h
index 5a861eb..3262056 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -44,7 +44,7 @@ extern "C"
44#define OBNUM 128 44#define OBNUM 128
45#define LOOPS 128 45#define LOOPS 128
46 46
47extern Evas *evas; 47extern Evas *G_evas;
48extern int win_w, win_h; 48extern int win_w, win_h;
49extern int loops; 49extern int loops;
50extern const char *choosen_engine; 50extern 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)
73 { 73 {
74 int r, g, b, a; 74 int r, g, b, a;
75 75
76 o = eo_add(EVAS_POLYGON_CLASS, evas); 76 o = eo_add(EVAS_POLYGON_CLASS, G_evas);
77 o_images[i] = o; 77 o_images[i] = o;
78 a = (rnd()&0xff) / 2; 78 a = (rnd()&0xff) / 2;
79 r = ((rnd()&0xff) * a) / 255; 79 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)
22 int i; 22 int i;
23 Evas_Object *o,*src; 23 Evas_Object *o,*src;
24 24
25 o = eo_add(EVAS_IMAGE_CLASS, evas); 25 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
26 eo_do(o, 26 eo_do(o,
27 efl_file_set(build_path("logo.png"), NULL), 27 efl_file_set(build_path("logo.png"), NULL),
28 evas_obj_image_fill_set(0, 0, 120, 160), 28 evas_obj_image_fill_set(0, 0, 120, 160),
@@ -33,7 +33,7 @@ static void _setup(void)
33 33
34 for (i = 1; i < OBNUM; i++) 34 for (i = 1; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EVAS_IMAGE_CLASS, evas); 36 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 eo_do(o, 38 eo_do(o,
39 evas_obj_image_source_set(src), 39 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)
26 int i; 26 int i;
27 Evas_Object *o,*src; 27 Evas_Object *o,*src;
28 28
29 o = eo_add(EVAS_IMAGE_CLASS, evas); 29 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
30 eo_do(o, efl_file_set(build_path("logo.png"), NULL), 30 eo_do(o, efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
@@ -35,7 +35,7 @@ static void _setup(void)
35 35
36 for (i = 0; i < OBNUM / 2; i++) 36 for (i = 0; i < OBNUM / 2; i++)
37 { 37 {
38 o = eo_add(EVAS_IMAGE_CLASS, evas); 38 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
39 o_images[i] = o; 39 o_images[i] = o;
40 eo_do(o, evas_obj_image_source_set(src, NULL), 40 eo_do(o, evas_obj_image_source_set(src, NULL),
41 evas_obj_size_set(120, 160), 41 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)
27 st = EVAS_TEXT_STYLE_SHADOW; 27 st = EVAS_TEXT_STYLE_SHADOW;
28 for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++) 28 for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
29 { 29 {
30 o = eo_add(EVAS_TEXT_CLASS, evas); 30 o = eo_add(EVAS_TEXT_CLASS, G_evas);
31 o_texts[i] = o; 31 o_texts[i] = o;
32 eo_do(o, 32 eo_do(o,
33 efl_text_properties_font_set("Vera-Bold", 20), 33 efl_text_properties_font_set("Vera-Bold", 20),
@@ -46,7 +46,7 @@ static void _setup(void)
46 for ( ; i < OBNUM ; i ++) 46 for ( ; i < OBNUM ; i ++)
47 { 47 {
48 s = o_texts[i % st]; 48 s = o_texts[i % st];
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
50 o_texts[i] = o; 50 o_texts[i] = o;
51 eo_do(o, evas_obj_image_source_set(s)); 51 eo_do(o, evas_obj_image_source_set(s));
52 /* FIXME s == NULL*/ 52 /* 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)
30 "Fiddly", "Family", "Lair", "Monkeys", "Magazine" 30 "Fiddly", "Family", "Lair", "Monkeys", "Magazine"
31 }; 31 };
32 srnd(); 32 srnd();
33 o = eo_add(EVAS_TEXT_CLASS, evas); 33 o = eo_add(EVAS_TEXT_CLASS, G_evas);
34 o_texts[0] = o; 34 o_texts[0] = o;
35 snprintf(buf, sizeof(buf), "%s %s %s %s.", 35 snprintf(buf, sizeof(buf), "%s %s %s %s.",
36 strs[rnd() % (sizeof(strs) / sizeof(char *))], 36 strs[rnd() % (sizeof(strs) / sizeof(char *))],
@@ -52,7 +52,7 @@ static void _setup(void)
52 evas_obj_visibility_set(EINA_TRUE)); 52 evas_obj_visibility_set(EINA_TRUE));
53 for (i = 1 ; i < OBNUM ; i ++) 53 for (i = 1 ; i < OBNUM ; i ++)
54 { 54 {
55 o = eo_add(EVAS_IMAGE_CLASS, evas); 55 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
56 o_texts[i] = o; 56 o_texts[i] = o;
57 eo_do(o, 57 eo_do(o,
58 evas_obj_image_source_set(o_texts[0])); 58 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)
26 { 26 {
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EVAS_RECTANGLE_CLASS, evas); 29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
30 o_images[i] = o; 30 o_images[i] = o;
31 a = rnd()&0xff; 31 a = rnd()&0xff;
32 r = ((rnd()&0xff) * a) / 255; 32 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)
29 { 29 {
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EVAS_RECTANGLE_CLASS, evas); 32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
33 o_images[i] = o; 33 o_images[i] = o;
34 a = rnd()&0xff; 34 a = rnd()&0xff;
35 r = ((rnd()&0xff) * a) / 255; 35 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)
26 { 26 {
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EVAS_RECTANGLE_CLASS, evas); 29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
30 o_images[i] = o; 30 o_images[i] = o;
31 a = 256 - (1 << ((rnd() % 8) + 1)); 31 a = 256 - (1 << ((rnd() % 8) + 1));
32 if (a < 128) a = 128; 32 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)
29 { 29 {
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EVAS_RECTANGLE_CLASS, evas); 32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
33 o_images[i] = o; 33 o_images[i] = o;
34 a = 256 - (1 << ((rnd() % 8) + 1)); 34 a = 256 - (1 << ((rnd() % 8) + 1));
35 if (a < 128) a = 128; 35 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)
26 { 26 {
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EVAS_RECTANGLE_CLASS, evas); 29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
30 o_images[i] = o; 30 o_images[i] = o;
31 a = 0xff; 31 a = 0xff;
32 r = ((rnd()&0xff) * a) / 255; 32 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)
29 { 29 {
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EVAS_RECTANGLE_CLASS, evas); 32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
33 o_images[i] = o; 33 o_images[i] = o;
34 a = 0xff; 34 a = 0xff;
35 r = ((rnd()&0xff) * a) / 255; 35 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)
25 25
26 for (i = 0; i < OBNUM; i++) 26 for (i = 0; i < OBNUM; i++)
27 { 27 {
28 o = eo_add(EVAS_TEXT_CLASS, evas); 28 o = eo_add(EVAS_TEXT_CLASS, G_evas);
29 o_texts[i] = o; 29 o_texts[i] = o;
30 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20), 30 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20),
31 efl_text_set("This is a test string"), 31 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)
32 srnd(); 32 srnd();
33 for (i = 0; i < OBNUM; i++) 33 for (i = 0; i < OBNUM; i++)
34 { 34 {
35 o = eo_add(EVAS_TEXT_CLASS, evas); 35 o = eo_add(EVAS_TEXT_CLASS, G_evas);
36 o_texts[i] = o; 36 o_texts[i] = o;
37 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20)); 37 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
38 snprintf(buf, sizeof(buf), "%s %s %s %s.", 38 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)
27 st = EVAS_TEXT_STYLE_SHADOW; 27 st = EVAS_TEXT_STYLE_SHADOW;
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_TEXT_CLASS, evas); 30 o = eo_add(EVAS_TEXT_CLASS, G_evas);
31 o_texts[i] = o; 31 o_texts[i] = o;
32 eo_do(o, 32 eo_do(o,
33 efl_text_properties_font_set("Vera-Bold", 20), 33 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)
34 st = EVAS_TEXT_STYLE_SHADOW; 34 st = EVAS_TEXT_STYLE_SHADOW;
35 for (i = 0; i < OBNUM; i++) 35 for (i = 0; i < OBNUM; i++)
36 { 36 {
37 o = eo_add(EVAS_TEXT_CLASS, evas); 37 o = eo_add(EVAS_TEXT_CLASS, G_evas);
38 o_texts[i] = o; 38 o_texts[i] = o;
39 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20)); 39 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
40 snprintf(buf, sizeof(buf), "%s %s %s %s.", 40 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 Evas_Textblock_Style *st; 24 Evas_Textblock_Style *st;
25 25
26 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 26 o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
27 o_text = o; 27 o_text = o;
28 st = evas_textblock_style_new(); 28 st = evas_textblock_style_new();
29 evas_textblock_style_set 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 Evas_Textblock_Style *st; 24 Evas_Textblock_Style *st;
25 25
26 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 26 o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
27 o_text = o; 27 o_text = o;
28 st = evas_textblock_style_new(); 28 st = evas_textblock_style_new();
29 evas_textblock_style_set 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 Evas_Textblock_Style *st; 24 Evas_Textblock_Style *st;
25 25
26 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 26 o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
27 o_text = o; 27 o_text = o;
28 st = evas_textblock_style_new(); 28 st = evas_textblock_style_new();
29 evas_textblock_style_set 29 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)
23 Evas_Object *o; 23 Evas_Object *o;
24 Evas_Textblock_Style *st; 24 Evas_Textblock_Style *st;
25 25
26 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 26 o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
27 o_text = o; 27 o_text = o;
28 st = evas_textblock_style_new(); 28 st = evas_textblock_style_new();
29 evas_textblock_style_set 29 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,
360 Menu_Item *mi; 360 Menu_Item *mi;
361 361
362 mi = malloc(sizeof(Menu_Item)); 362 mi = malloc(sizeof(Menu_Item));
363 mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas); 363 mi->o_icon = eo_add(EVAS_IMAGE_CLASS, G_evas);
364 eo_unref(mi->o_icon); 364 eo_unref(mi->o_icon);
365 eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL), 365 eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL),
366 evas_obj_size_set(32, 32), 366 evas_obj_size_set(32, 32),
@@ -390,7 +390,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
390 win_w = ui_w; 390 win_w = ui_w;
391 win_h = ui_h; 391 win_h = ui_h;
392 392
393 o = eo_add(EVAS_RECTANGLE_CLASS, evas); 393 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
394 eo_unref(o); 394 eo_unref(o);
395 eo_do(o, evas_obj_position_set(0, 0), 395 eo_do(o, evas_obj_position_set(0, 0),
396 evas_obj_size_set(win_w, win_h), 396 evas_obj_size_set(win_w, win_h),
@@ -401,7 +401,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
401 eo_event_callback_array_add(ui_callbacks(), NULL)); 401 eo_event_callback_array_add(ui_callbacks(), NULL));
402 o_bg = o; 402 o_bg = o;
403 403
404 o = eo_add(EVAS_RECTANGLE_CLASS, evas); 404 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
405 eo_unref(o); 405 eo_unref(o);
406 eo_do(o, evas_obj_position_set(0, 0), 406 eo_do(o, evas_obj_position_set(0, 0),
407 evas_obj_size_set(win_w, win_h), 407 evas_obj_size_set(win_w, win_h),
@@ -410,7 +410,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
410 evas_obj_visibility_set(EINA_TRUE)); 410 evas_obj_visibility_set(EINA_TRUE));
411 o_wallpaper = o; 411 o_wallpaper = o;
412 412
413 o = eo_add(EVAS_TEXT_CLASS, evas); 413 o = eo_add(EVAS_TEXT_CLASS, G_evas);
414 eo_unref(o); 414 eo_unref(o);
415 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 415 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
416 efl_text_set("EXPEDITE"), 416 efl_text_set("EXPEDITE"),
@@ -424,7 +424,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
424 evas_obj_visibility_set(EINA_TRUE)); 424 evas_obj_visibility_set(EINA_TRUE));
425 o_title = o; 425 o_title = o;
426 426
427 o = eo_add(EVAS_TEXT_CLASS, evas); 427 o = eo_add(EVAS_TEXT_CLASS, G_evas);
428 eo_unref(o); 428 eo_unref(o);
429 eo_do(o, efl_text_properties_font_set("Vera", 9), 429 eo_do(o, efl_text_properties_font_set("Vera", 9),
430 efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."), 430 efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
@@ -438,7 +438,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
438 evas_obj_visibility_set(EINA_TRUE)); 438 evas_obj_visibility_set(EINA_TRUE));
439 o_byline = o; 439 o_byline = o;
440 440
441 o = eo_add(EVAS_IMAGE_CLASS, evas); 441 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
442 eo_unref(o); 442 eo_unref(o);
443 eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)), 443 eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
444 efl_file_set(build_path("e-logo.png"), NULL), 444 efl_file_set(build_path("e-logo.png"), NULL),
@@ -449,7 +449,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
449 evas_obj_visibility_set(EINA_TRUE)); 449 evas_obj_visibility_set(EINA_TRUE));
450 o_menu_logo = o; 450 o_menu_logo = o;
451 451
452 o = eo_add(EVAS_IMAGE_CLASS, evas); 452 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
453 eo_unref(o); 453 eo_unref(o);
454 eo_do(o, evas_obj_position_set(win_w - 128, - 128), 454 eo_do(o, evas_obj_position_set(win_w - 128, - 128),
455 evas_obj_image_fill_set(0, 0, 256, 256), 455 evas_obj_image_fill_set(0, 0, 256, 256),
@@ -457,7 +457,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
457 evas_obj_visibility_set(EINA_TRUE)); 457 evas_obj_visibility_set(EINA_TRUE));
458 o_menu_icon = o; 458 o_menu_icon = o;
459 459
460 o = eo_add(EVAS_IMAGE_CLASS, evas); 460 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
461 eo_unref(o); 461 eo_unref(o);
462 eo_do(o, evas_obj_position_set(0, 0), 462 eo_do(o, evas_obj_position_set(0, 0),
463 efl_file_set(build_path("icon_sel.png"), NULL), 463 efl_file_set(build_path("icon_sel.png"), NULL),
@@ -465,7 +465,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
465 evas_obj_image_fill_set(0, 0, 48, 48)); 465 evas_obj_image_fill_set(0, 0, 48, 48));
466 o_menu_icon_sel = o; 466 o_menu_icon_sel = o;
467 467
468 o = eo_add(EVAS_IMAGE_CLASS, evas); 468 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
469 eo_unref(o); 469 eo_unref(o);
470 eo_do(o, evas_obj_position_set(0, 0), 470 eo_do(o, evas_obj_position_set(0, 0),
471 efl_file_set(build_path("text_sel.png"), NULL), 471 efl_file_set(build_path("text_sel.png"), NULL),
@@ -474,7 +474,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
474 evas_obj_image_border_set(7, 7, 7, 7)); 474 evas_obj_image_border_set(7, 7, 7, 7));
475 o_menu_text_sel = o; 475 o_menu_text_sel = o;
476 476
477 o = eo_add(EVAS_TEXT_CLASS, evas); 477 o = eo_add(EVAS_TEXT_CLASS, G_evas);
478 eo_unref(o); 478 eo_unref(o);
479 eo_do(o, efl_text_properties_font_set("Vera", 10), 479 eo_do(o, efl_text_properties_font_set("Vera", 10),
480 efl_text_set(""), 480 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)
46 Evas_Object *o; 46 Evas_Object *o;
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
54 evas_obj_visibility_set(EINA_TRUE)); 54 evas_obj_visibility_set(EINA_TRUE));
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = eo_add(EVAS_TEXT_CLASS, G_evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
59 efl_text_set(icons[i % 13]), 59 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)
46 Evas_Object *o; 46 Evas_Object *o;
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
54 evas_obj_visibility_set(EINA_TRUE)); 54 evas_obj_visibility_set(EINA_TRUE));
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = eo_add(EVAS_TEXT_CLASS, G_evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
59 efl_text_set(icons[i % 13]), 59 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)
46 Evas_Object *o; 46 Evas_Object *o;
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
54 evas_obj_visibility_set(EINA_TRUE)); 54 evas_obj_visibility_set(EINA_TRUE));
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = eo_add(EVAS_TEXT_CLASS, G_evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
59 efl_text_set(icons[i % 13]), 59 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)
31 Evas_Object *o; 31 Evas_Object *o;
32 for (i = 0; i < NUM; i++) 32 for (i = 0; i < NUM; i++)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, evas); 34 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
35 o_images[i] = o; 35 o_images[i] = o;
36 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), 36 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL),
37 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 37 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
38 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 38 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
39 evas_obj_visibility_set(EINA_TRUE)); 39 evas_obj_visibility_set(EINA_TRUE));
40 40
41 o = eo_add(EVAS_TEXT_CLASS, evas); 41 o = eo_add(EVAS_TEXT_CLASS, G_evas);
42 o_texts[i] = o; 42 o_texts[i] = o;
43 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 43 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
44 efl_text_set(icons[i % 1]), 44 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)
31 Evas_Object *o; 31 Evas_Object *o;
32 for (i = 0; i < NUM; i++) 32 for (i = 0; i < NUM; i++)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, evas); 34 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
35 o_images[i] = o; 35 o_images[i] = o;
36 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), 36 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL),
37 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 37 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
38 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 38 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
39 evas_obj_visibility_set(EINA_TRUE)); 39 evas_obj_visibility_set(EINA_TRUE));
40 40
41 o = eo_add(EVAS_TEXT_CLASS, evas); 41 o = eo_add(EVAS_TEXT_CLASS, G_evas);
42 o_texts[i] = o; 42 o_texts[i] = o;
43 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 43 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
44 efl_text_set(icons[i % 1]), 44 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)
46 Evas_Object *o; 46 Evas_Object *o;
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
54 evas_obj_visibility_set(EINA_TRUE)); 54 evas_obj_visibility_set(EINA_TRUE));
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = eo_add(EVAS_TEXT_CLASS, G_evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
59 efl_text_set(icons[i % 13]), 59 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)
46 Evas_Object *o; 46 Evas_Object *o;
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
54 evas_obj_visibility_set(EINA_TRUE)); 54 evas_obj_visibility_set(EINA_TRUE));
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = eo_add(EVAS_TEXT_CLASS, G_evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
59 efl_text_set(icons[i % 13]), 59 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)
62 Evas_Object *o; 62 Evas_Object *o;
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EVAS_IMAGE_CLASS, evas); 65 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
70 evas_obj_size_set(win_w, ICON_SIZE), 70 evas_obj_size_set(win_w, ICON_SIZE),
71 evas_obj_visibility_set(EINA_TRUE)); 71 evas_obj_visibility_set(EINA_TRUE));
72 72
73 o = eo_add(EVAS_TEXT_CLASS, evas); 73 o = eo_add(EVAS_TEXT_CLASS, G_evas);
74 o_texts[i] = o; 74 o_texts[i] = o;
75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
76 efl_text_set(labels[i % 26]), 76 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)
62 Evas_Object *o; 62 Evas_Object *o;
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EVAS_IMAGE_CLASS, evas); 65 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
70 evas_obj_size_set(win_w, ICON_SIZE), 70 evas_obj_size_set(win_w, ICON_SIZE),
71 evas_obj_visibility_set(EINA_TRUE)); 71 evas_obj_visibility_set(EINA_TRUE));
72 72
73 o = eo_add(EVAS_TEXT_CLASS, evas); 73 o = eo_add(EVAS_TEXT_CLASS, G_evas);
74 o_texts[i] = o; 74 o_texts[i] = o;
75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
76 efl_text_set(labels[i % 26]), 76 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)
62 Evas_Object *o; 62 Evas_Object *o;
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EVAS_IMAGE_CLASS, evas); 65 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
70 evas_obj_size_set(win_w, ICON_SIZE), 70 evas_obj_size_set(win_w, ICON_SIZE),
71 evas_obj_visibility_set(EINA_TRUE)); 71 evas_obj_visibility_set(EINA_TRUE));
72 72
73 o = eo_add(EVAS_TEXT_CLASS, evas); 73 o = eo_add(EVAS_TEXT_CLASS, G_evas);
74 o_texts[i] = o; 74 o_texts[i] = o;
75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
76 efl_text_set(labels[i % 26]), 76 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)
62 Evas_Object *o; 62 Evas_Object *o;
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EVAS_IMAGE_CLASS, evas); 65 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
70 evas_obj_size_set(win_w, ICON_SIZE), 70 evas_obj_size_set(win_w, ICON_SIZE),
71 evas_obj_visibility_set(EINA_TRUE)); 71 evas_obj_visibility_set(EINA_TRUE));
72 72
73 o = eo_add(EVAS_TEXT_CLASS, evas); 73 o = eo_add(EVAS_TEXT_CLASS, G_evas);
74 o_texts[i] = o; 74 o_texts[i] = o;
75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
76 efl_text_set(labels[i % 26]), 76 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)
83 Evas_Object *o; 83 Evas_Object *o;
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EVAS_IMAGE_CLASS, evas); 86 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
91 evas_obj_size_set(win_w, ICON_SIZE), 91 evas_obj_size_set(win_w, ICON_SIZE),
92 evas_obj_visibility_set(EINA_TRUE)); 92 evas_obj_visibility_set(EINA_TRUE));
93 93
94 o = eo_add(EVAS_IMAGE_CLASS, evas); 94 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
95 o_icons[i] = o; 95 o_icons[i] = o;
96 eo_do(o, evas_obj_image_filled_set(1), 96 eo_do(o, evas_obj_image_filled_set(1),
97 evas_obj_image_border_set(2, 2, 2, 2), 97 evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
100 evas_obj_visibility_set(EINA_TRUE)); 100 evas_obj_visibility_set(EINA_TRUE));
101 101
102 o = eo_add(EVAS_TEXT_CLASS, evas); 102 o = eo_add(EVAS_TEXT_CLASS, G_evas);
103 o_texts[i] = o; 103 o_texts[i] = o;
104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
105 efl_text_set(labels[i % 26]), 105 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)
83 Evas_Object *o; 83 Evas_Object *o;
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EVAS_IMAGE_CLASS, evas); 86 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
91 evas_obj_size_set(win_w, ICON_SIZE), 91 evas_obj_size_set(win_w, ICON_SIZE),
92 evas_obj_visibility_set(EINA_TRUE)); 92 evas_obj_visibility_set(EINA_TRUE));
93 93
94 o = eo_add(EVAS_IMAGE_CLASS, evas); 94 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
95 o_icons[i] = o; 95 o_icons[i] = o;
96 eo_do(o, evas_obj_image_filled_set(1), 96 eo_do(o, evas_obj_image_filled_set(1),
97 evas_obj_image_border_set(2, 2, 2, 2), 97 evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
100 evas_obj_visibility_set(EINA_TRUE)); 100 evas_obj_visibility_set(EINA_TRUE));
101 101
102 o = eo_add(EVAS_TEXT_CLASS, evas); 102 o = eo_add(EVAS_TEXT_CLASS, G_evas);
103 o_texts[i] = o; 103 o_texts[i] = o;
104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
105 efl_text_set(labels[i % 26]), 105 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)
83 Evas_Object *o; 83 Evas_Object *o;
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EVAS_IMAGE_CLASS, evas); 86 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
91 evas_obj_size_set(win_w, ICON_SIZE), 91 evas_obj_size_set(win_w, ICON_SIZE),
92 evas_obj_visibility_set(EINA_TRUE)); 92 evas_obj_visibility_set(EINA_TRUE));
93 93
94 o = eo_add(EVAS_IMAGE_CLASS, evas); 94 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
95 o_icons[i] = o; 95 o_icons[i] = o;
96 eo_do(o, evas_obj_image_filled_set(1), 96 eo_do(o, evas_obj_image_filled_set(1),
97 evas_obj_image_border_set(2, 2, 2, 2), 97 evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
100 evas_obj_visibility_set(EINA_TRUE)); 100 evas_obj_visibility_set(EINA_TRUE));
101 101
102 o = eo_add(EVAS_TEXT_CLASS, evas); 102 o = eo_add(EVAS_TEXT_CLASS, G_evas);
103 o_texts[i] = o; 103 o_texts[i] = o;
104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
105 efl_text_set(labels[i % 26]), 105 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)
83 Evas_Object *o; 83 Evas_Object *o;
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EVAS_IMAGE_CLASS, evas); 86 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
91 evas_obj_size_set(win_w, ICON_SIZE), 91 evas_obj_size_set(win_w, ICON_SIZE),
92 evas_obj_visibility_set(EINA_TRUE)); 92 evas_obj_visibility_set(EINA_TRUE));
93 93
94 o = eo_add(EVAS_IMAGE_CLASS, evas); 94 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
95 o_icons[i] = o; 95 o_icons[i] = o;
96 eo_do(o, evas_obj_image_filled_set(1), 96 eo_do(o, evas_obj_image_filled_set(1),
97 evas_obj_image_border_set(2, 2, 2, 2), 97 evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
100 evas_obj_visibility_set(EINA_TRUE)); 100 evas_obj_visibility_set(EINA_TRUE));
101 101
102 o = eo_add(EVAS_TEXT_CLASS, evas); 102 o = eo_add(EVAS_TEXT_CLASS, G_evas);
103 o_texts[i] = o; 103 o_texts[i] = o;
104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
105 efl_text_set(labels[i % 26]), 105 efl_text_set(labels[i % 26]),