summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/about.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.c4
-rw-r--r--src/bin/image_blend_solid_middle_unscaled.c4
-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.c2
-rw-r--r--src/bin/image_data_argb.c15
-rw-r--r--src/bin/image_data_argb_alpha.c16
-rw-r--r--src/bin/image_data_ycbcr601pl.c4
-rw-r--r--src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c9
-rw-r--r--src/bin/image_data_ycbcr601pl_map_solid_rotate.c9
-rw-r--r--src/bin/image_data_ycbcr601pl_wide_stride.c10
-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_mask.c2
-rw-r--r--src/bin/image_mask_10.c4
-rw-r--r--src/bin/image_mask_11.c4
-rw-r--r--src/bin/image_mask_12.c4
-rw-r--r--src/bin/image_mask_13.c4
-rw-r--r--src/bin/image_mask_2.c2
-rw-r--r--src/bin/image_mask_3.c2
-rw-r--r--src/bin/image_mask_4.c4
-rw-r--r--src/bin/image_mask_5.c4
-rw-r--r--src/bin/image_mask_6.c4
-rw-r--r--src/bin/image_mask_7.c4
-rw-r--r--src/bin/image_mask_8.c4
-rw-r--r--src/bin/image_mask_9.c4
-rw-r--r--src/bin/image_quality_scale.c2
-rw-r--r--src/bin/line_blend.c10
-rw-r--r--src/bin/poly_blend.c2
-rw-r--r--src/bin/proxy_image.c2
-rw-r--r--src/bin/proxy_image_offscreen.c2
-rw-r--r--src/bin/proxy_text_fixed.c14
-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/snapshot_widgets_file_icons.c12
-rw-r--r--src/bin/text_basic.c4
-rw-r--r--src/bin/text_change.c4
-rw-r--r--src/bin/text_styles.c14
-rw-r--r--src/bin/text_styles_different_strings.c14
-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.c6
-rw-r--r--src/bin/vg_basic_circle.c2
-rw-r--r--src/bin/vg_basic_gradient.c2
-rw-r--r--src/bin/vg_basic_rect.c2
-rw-r--r--src/bin/vg_scaled.c2
-rw-r--r--src/bin/widgets_file_icons.c10
-rw-r--r--src/bin/widgets_file_icons_2.c6
-rw-r--r--src/bin/widgets_file_icons_2_grouped.c6
-rw-r--r--src/bin/widgets_file_icons_2_same.c6
-rw-r--r--src/bin/widgets_file_icons_2_same_grouped.c6
-rw-r--r--src/bin/widgets_file_icons_3.c6
-rw-r--r--src/bin/widgets_file_icons_4.c6
-rw-r--r--src/bin/widgets_list_1.c6
-rw-r--r--src/bin/widgets_list_1_grouped.c6
-rw-r--r--src/bin/widgets_list_2.c6
-rw-r--r--src/bin/widgets_list_2_grouped.c6
-rw-r--r--src/bin/widgets_list_3.c8
-rw-r--r--src/bin/widgets_list_3_grouped.c8
-rw-r--r--src/bin/widgets_list_4.c8
-rw-r--r--src/bin/widgets_list_4_grouped.c8
114 files changed, 229 insertions, 212 deletions
diff --git a/src/bin/about.c b/src/bin/about.c
index f225b4a..4d0339b 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -49,7 +49,7 @@ _setup(void)
49static void 49static void
50_cleanup(void) 50_cleanup(void)
51{ 51{
52 eo_del(o_text); 52 eo_unref(o_text);
53 o_text = NULL; 53 o_text = NULL;
54} 54}
55 55
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 9056755..2e35a8b 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 37a8304..670b40a 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index 48964bf..fd5d793 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index 479e133..c10accf 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -40,7 +40,7 @@ static void _setup(void)
40static void _cleanup(void) 40static void _cleanup(void)
41{ 41{
42 int i; 42 int i;
43 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 43 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
44} 44}
45 45
46/* loop - do things */ 46/* loop - do things */
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index 7fb6d5e..f2d2334 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < MANYNUM; i++) eo_del(o_images[i]); 46 for (i = 0; i < MANYNUM; i++) eo_unref(o_images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 46dc638..6016309 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 43b0fa1..f43c1c8 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index 99fad1c..a5747b1 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 561c52d..e45f7e3 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index 1a7c59d..3df5023 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -50,7 +50,7 @@ static void _setup(void)
50static void _cleanup(void) 50static void _cleanup(void)
51{ 51{
52 int i; 52 int i;
53 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 53 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
54} 54}
55 55
56/* loop - do things */ 56/* loop - do things */
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index bec28f5..c4f9679 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 00c988b..8d82f27 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 65f7b77..b6cdd97 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 7853fcd..7df3447 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -50,7 +50,7 @@ static void _setup(void)
50static void _cleanup(void) 50static void _cleanup(void)
51{ 51{
52 int i; 52 int i;
53 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 53 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
54} 54}
55 55
56/* loop - do things */ 56/* loop - do things */
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 4d5668d..bddcdb6 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index b5e643a..cbf2204 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 3db2b7f..39f527c 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index 6c60261..9f517c8 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -50,7 +50,7 @@ static void _setup(void)
50static void _cleanup(void) 50static void _cleanup(void)
51{ 51{
52 int i; 52 int i;
53 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 53 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
54} 54}
55 55
56/* loop - do things */ 56/* loop - do things */
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index daf4e68..b4a5514 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index 9485048..4f2f13e 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 2b1423f..a02faf1 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index a71d5dc..67e432d 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index f6ccf32..350d581 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 54512d1..627466a 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index 6e3078a..837042a 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index b58670f..203e221 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 74cf9ba..6b32d15 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index a0f35d4..ac46144 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index b80e615..0634837 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("bar.png"), NULL); 28 efl_file_set(o, build_path("bar.png"), NULL);
29 efl_image_border_set(o, 6, 6, 6, 6); 29 efl_image_border_set(o, 6, 6, 6, 6);
30 efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); 30 efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID);
31 efl_gfx_visible_set(o, EINA_TRUE); 31 efl_gfx_visible_set(o, EINA_TRUE);
32 } 32 }
33 done = 0; 33 done = 0;
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index 8a2aecd..8051027 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -29,7 +29,7 @@ static void _setup(void)
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_size_set(o, 120, 160);
31 efl_image_border_set(o, 43, 48, 48, 83); 31 efl_image_border_set(o, 43, 48, 48, 83);
32 efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); 32 efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID);
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_visible_set(o, EINA_TRUE);
34 } 34 }
35 done = 0; 35 done = 0;
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 42 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 7ad5f02..e731cc4 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 139f565..32185dc 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 2345130..e797a8d 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < 2; i++) eo_del(o_images[i]); 46 for (i = 0; i < 2; i++) eo_unref(o_images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 25666fc..cad0095 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -44,7 +44,7 @@ static void _setup(void)
44static void _cleanup(void) 44static void _cleanup(void)
45{ 45{
46 int i; 46 int i;
47 for (i = 0; i < 1; i++) eo_del(o_images[i]); 47 for (i = 0; i < 1; i++) eo_unref(o_images[i]);
48} 48}
49 49
50/* loop - do things */ 50/* loop - do things */
@@ -55,6 +55,7 @@ static void _loop(double t, int f)
55 for (i = 0; i < 1; i++) 55 for (i = 0; i < 1; i++)
56 { 56 {
57 unsigned int *data, *p; 57 unsigned int *data, *p;
58 int length;
58 59
59 w = 640; 60 w = 640;
60 h = 480; 61 h = 480;
@@ -63,7 +64,15 @@ static void _loop(double t, int f)
63 efl_gfx_position_set(o_images[i], x, y); 64 efl_gfx_position_set(o_images[i], x, y);
64 efl_gfx_size_set(o_images[i], w, h); 65 efl_gfx_size_set(o_images[i], w, h);
65 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 66 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
66 data = efl_gfx_buffer_get(o_images[i], 1, &w, &h, &st, NULL); 67 data = efl_gfx_buffer_map(o_images[i], &length,
68 EFL_GFX_BUFFER_ACCESS_MODE_WRITE,
69 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888,
70 &st);
71 if (!data)
72 {
73 fprintf(stderr, "ERROR: Failed to map image!\n");
74 continue;
75 }
67 st = st >> 2; 76 st = st >> 2;
68 p = data; 77 p = data;
69 for (y = 0; y < h; y++) 78 for (y = 0; y < h; y++)
@@ -75,7 +84,7 @@ static void _loop(double t, int f)
75 } 84 }
76 p += (st - w); 85 p += (st - w);
77 } 86 }
78 efl_gfx_buffer_set(o_images[i], data, w, h, st << 2, EFL_GFX_COLORSPACE_ARGB8888); 87 efl_gfx_buffer_unmap(o_images[i], data, length);
79 efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h); 88 efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h);
80 } 89 }
81 FPS_STD(NAME); 90 FPS_STD(NAME);
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 6eb8662..a59f812 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -44,7 +44,7 @@ static void _setup(void)
44static void _cleanup(void) 44static void _cleanup(void)
45{ 45{
46 int i; 46 int i;
47 for (i = 0; i < 1; i++) eo_del(o_images[i]); 47 for (i = 0; i < 1; i++) eo_unref(o_images[i]);
48} 48}
49 49
50/* loop - do things */ 50/* loop - do things */
@@ -55,7 +55,7 @@ static void _loop(double t, int f)
55 for (i = 0; i < 1; i++) 55 for (i = 0; i < 1; i++)
56 { 56 {
57 unsigned int *data, *p; 57 unsigned int *data, *p;
58 int a, r, g, b; 58 int a, r, g, b, length;
59 59
60 w = 640; 60 w = 640;
61 h = 480; 61 h = 480;
@@ -64,7 +64,15 @@ static void _loop(double t, int f)
64 efl_gfx_position_set(o_images[i], x, y); 64 efl_gfx_position_set(o_images[i], x, y);
65 efl_gfx_size_set(o_images[i], w, h); 65 efl_gfx_size_set(o_images[i], w, h);
66 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 66 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
67 data = efl_gfx_buffer_get(o_images[i], 1, &w, &h, &st, NULL); 67 data = efl_gfx_buffer_map(o_images[i], &length,
68 EFL_GFX_BUFFER_ACCESS_MODE_WRITE,
69 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888,
70 &st);
71 if (!data)
72 {
73 fprintf(stderr, "ERROR: Failed to map image!\n");
74 continue;
75 }
68 st = st >> 2; 76 st = st >> 2;
69 p = data; 77 p = data;
70 for (y = 0; y < h; y++) 78 for (y = 0; y < h; y++)
@@ -87,7 +95,7 @@ static void _loop(double t, int f)
87 } 95 }
88 p += (st - w); 96 p += (st - w);
89 } 97 }
90 efl_gfx_buffer_set(o_images[i], data, w, h, st << 2, EFL_GFX_COLORSPACE_ARGB8888); 98 efl_gfx_buffer_unmap(o_images[i], data, length);
91 efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h); 99 efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h);
92 } 100 }
93 FPS_STD(NAME); 101 FPS_STD(NAME);
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index f28ef97..b13d57f 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -27,8 +27,6 @@ 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 unsigned int length;
31
32 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
33 o_images[i] = o; 31 o_images[i] = o;
34 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@@ -79,7 +77,7 @@ static void _setup(void)
79static void _cleanup(void) 77static void _cleanup(void)
80{ 78{
81 int i; 79 int i;
82 for (i = 0; i < 1; i++) eo_del(o_images[i]); 80 for (i = 0; i < 1; i++) eo_unref(o_images[i]);
83 // FIXME: the object is not destroyed anymore so we can't free the data 81 // FIXME: the object is not destroyed anymore so we can't free the data
84 /* free(yp); */ 82 /* free(yp); */
85 /* free(up); */ 83 /* free(up); */
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 e132e77..198a155 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -27,8 +27,6 @@ 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 unsigned int length;
31
32 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
33 o_images[i] = o; 31 o_images[i] = o;
34 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@@ -65,7 +63,10 @@ static void _setup(void)
65 *lp = vp + (y * 320); 63 *lp = vp + (y * 320);
66 lp++; 64 lp++;
67 } 65 }
68 efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL); 66 efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL);
67 free(yp);
68 free(up);
69 free(vp);
69 } 70 }
70 done = 0; 71 done = 0;
71} 72}
@@ -74,7 +75,7 @@ static void _setup(void)
74static void _cleanup(void) 75static void _cleanup(void)
75{ 76{
76 int i; 77 int i;
77 for (i = 0; i < 1; i++) eo_del(o_images[i]); 78 for (i = 0; i < 1; i++) eo_unref(o_images[i]);
78 /* free(yp); */ 79 /* free(yp); */
79 /* free(up); */ 80 /* free(up); */
80 /* free(vp); */ 81 /* free(vp); */
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 28dd6c8..3670511 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -27,8 +27,6 @@ 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 unsigned int length;
31
32 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
33 o_images[i] = o; 31 o_images[i] = o;
34 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@@ -64,7 +62,10 @@ static void _setup(void)
64 *lp = vp + (y * 320); 62 *lp = vp + (y * 320);
65 lp++; 63 lp++;
66 } 64 }
67 efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL); 65 efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL);
66 free(yp);
67 free(up);
68 free(vp);
68 } 69 }
69 done = 0; 70 done = 0;
70} 71}
@@ -73,7 +74,7 @@ static void _setup(void)
73static void _cleanup(void) 74static void _cleanup(void)
74{ 75{
75 int i; 76 int i;
76 for (i = 0; i < 1; i++) eo_del(o_images[i]); 77 for (i = 0; i < 1; i++) eo_unref(o_images[i]);
77 /* free(yp); */ 78 /* free(yp); */
78 /* free(up); */ 79 /* free(up); */
79 /* free(vp); */ 80 /* free(vp); */
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index 4599260..059e17f 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -27,8 +27,6 @@ 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 unsigned int length;
31
32 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
33 o_images[i] = o; 31 o_images[i] = o;
34 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@@ -64,8 +62,11 @@ static void _setup(void)
64 *lp = vp + (y * 320); 62 *lp = vp + (y * 320);
65 lp++; 63 lp++;
66 } 64 }
67 efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL); 65 efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL);
68 efl_gfx_buffer_update_add(o_images[i], 0, 0, 320, 480); 66 efl_gfx_buffer_update_add(o_images[i], 0, 0, 320, 480);
67 free(yp);
68 free(up);
69 free(vp);
69 } 70 }
70 done = 0; 71 done = 0;
71} 72}
@@ -74,7 +75,7 @@ static void _setup(void)
74static void _cleanup(void) 75static void _cleanup(void)
75{ 76{
76 int i; 77 int i;
77 for (i = 0; i < 1; i++) eo_del(o_images[i]); 78 for (i = 0; i < 1; i++) eo_unref(o_images[i]);
78 /* free(yp); */ 79 /* free(yp); */
79 /* free(up); */ 80 /* free(up); */
80 /* free(vp); */ 81 /* free(vp); */
@@ -88,7 +89,6 @@ static void _loop(double t, int f)
88 for (i = 0; i < 1; i++) 89 for (i = 0; i < 1; i++)
89 { 90 {
90 unsigned char **data, **lp; 91 unsigned char **data, **lp;
91 int stride;
92 92
93 w = 640; 93 w = 640;
94 h = 480; 94 h = 480;
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 03f0986..885a902 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -171,7 +171,7 @@ _cube_free(Cube *c)
171{ 171{
172 int i; 172 int i;
173 173
174 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 174 for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
175 free(c); 175 free(c);
176} 176}
177 177
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index e925987..27e24ab 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -169,7 +169,7 @@ _cube_free(Cube *c)
169{ 169{
170 int i; 170 int i;
171 171
172 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 172 for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
173 free(c); 173 free(c);
174} 174}
175 175
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index c7acb0f..aa42e60 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -163,7 +163,7 @@ _cube_free(Cube *c)
163{ 163{
164 int i; 164 int i;
165 165
166 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 166 for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
167 free(c); 167 free(c);
168} 168}
169 169
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index 3ccf903..4c62ba3 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -161,7 +161,7 @@ _cube_free(Cube *c)
161{ 161{
162 int i; 162 int i;
163 163
164 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 164 for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
165 free(c); 165 free(c);
166} 166}
167 167
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 529104c..eb62b87 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -171,7 +171,7 @@ _cube_free(Cube *c)
171{ 171{
172 int i; 172 int i;
173 173
174 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 174 for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
175 free(c); 175 free(c);
176} 176}
177 177
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index a6c84cf..64ac13b 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -168,7 +168,7 @@ _cube_free(Cube *c)
168{ 168{
169 int i; 169 int i;
170 170
171 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 171 for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
172 free(c); 172 free(c);
173} 173}
174 174
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index 6f60976..caf77cb 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -56,8 +56,8 @@ static void _cleanup(void)
56 int i; 56 int i;
57 for (i = 0; i < CNUM; i++) 57 for (i = 0; i < CNUM; i++)
58 { 58 {
59 eo_del(o_images[i]); 59 eo_unref(o_images[i]);
60 eo_del(o_reflec[i]); 60 eo_unref(o_reflec[i]);
61 } 61 }
62} 62}
63 63
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index c59442b..8c36070 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
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 230bf90..74463cc 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 7483e2e..1e36963 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 075a10a..542c3c3 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index e1b0038..c6582ab 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index c776155..a6445d9 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 2f5053c..00aae66 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index ad7690e..1931a5e 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index ead9e9b..caebe5f 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 08f4db2..6abafa1 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 2289781..1dab593 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index 38302b2..411e263 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c
index b757324..49eaa2e 100644
--- a/src/bin/image_mask.c
+++ b/src/bin/image_mask.c
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index 03862d8..0c12a17 100644
--- a/src/bin/image_mask_10.c
+++ b/src/bin/image_mask_10.c
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < 1; i++) eo_del(o_images[i]); 51 for (i = 0; i < 1; i++) eo_unref(o_images[i]);
52 eo_del(o_mask); 52 eo_unref(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index eadacb4..fd5a997 100644
--- a/src/bin/image_mask_11.c
+++ b/src/bin/image_mask_11.c
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
52 eo_del(o_mask); 52 eo_unref(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c
index bba8768..f989405 100644
--- a/src/bin/image_mask_12.c
+++ b/src/bin/image_mask_12.c
@@ -49,8 +49,8 @@ static void _setup(void)
49static void _cleanup(void) 49static void _cleanup(void)
50{ 50{
51 int i; 51 int i;
52 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 52 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
53 eo_del(o_mask); 53 eo_unref(o_mask);
54} 54}
55 55
56/* loop - do things */ 56/* loop - do things */
diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c
index 979b0a0..aa1ffcb 100644
--- a/src/bin/image_mask_13.c
+++ b/src/bin/image_mask_13.c
@@ -49,8 +49,8 @@ static void _setup(void)
49static void _cleanup(void) 49static void _cleanup(void)
50{ 50{
51 int i; 51 int i;
52 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 52 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
53 eo_del(o_mask); 53 eo_unref(o_mask);
54} 54}
55 55
56/* loop - do things */ 56/* loop - do things */
diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c
index db87b90..23bce11 100644
--- a/src/bin/image_mask_2.c
+++ b/src/bin/image_mask_2.c
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c
index a3075af..d89f99a 100644
--- a/src/bin/image_mask_3.c
+++ b/src/bin/image_mask_3.c
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c
index 90ab4b5..e2f2087 100644
--- a/src/bin/image_mask_4.c
+++ b/src/bin/image_mask_4.c
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
52 eo_del(o_mask); 52 eo_unref(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c
index 53fa584..f30e882 100644
--- a/src/bin/image_mask_5.c
+++ b/src/bin/image_mask_5.c
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
52 eo_del(o_mask); 52 eo_unref(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c
index 8e5684d..054608a 100644
--- a/src/bin/image_mask_6.c
+++ b/src/bin/image_mask_6.c
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
52 eo_del(o_mask); 52 eo_unref(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c
index 13c8d76..c33f6e9 100644
--- a/src/bin/image_mask_7.c
+++ b/src/bin/image_mask_7.c
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
52 eo_del(o_mask); 52 eo_unref(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c
index b31c624..f57de30 100644
--- a/src/bin/image_mask_8.c
+++ b/src/bin/image_mask_8.c
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < 1; i++) eo_del(o_images[i]); 51 for (i = 0; i < 1; i++) eo_unref(o_images[i]);
52 eo_del(o_mask); 52 eo_unref(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index 9289952..35004dd 100644
--- a/src/bin/image_mask_9.c
+++ b/src/bin/image_mask_9.c
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < 1; i++) eo_del(o_images[i]); 51 for (i = 0; i < 1; i++) eo_unref(o_images[i]);
52 eo_del(o_mask); 52 eo_unref(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 34f61fc..4a25fc0 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < 1; i++) eo_del(o_images[i]); 41 for (i = 0; i < 1; i++) eo_unref(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c
index 9deeb18..c4c635d 100644
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@@ -26,14 +26,14 @@ 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 = evas_object_line_add(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;
33 g = ((rnd()&0xff) * a) / 255; 33 g = ((rnd()&0xff) * a) / 255;
34 b = ((rnd()&0xff) * a) / 255; 34 b = ((rnd()&0xff) * a) / 255;
35 efl_gfx_color_set(o, r, g, b, a); 35 efl_gfx_color_set(o, r, g, b, a);
36 evas_obj_line_xy_set(o, ((win_w / 2) * (rnd()&0xff)) / 255, ((win_h / 2) * (rnd()&0xff)) / 255, ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2)); 36 evas_object_line_xy_set(o, ((win_w / 2) * (rnd()&0xff)) / 255, ((win_h / 2) * (rnd()&0xff)) / 255, ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2));
37 efl_gfx_visible_set(o, EINA_TRUE); 37 efl_gfx_visible_set(o, EINA_TRUE);
38 38
39 39
@@ -45,7 +45,7 @@ static void _setup(void)
45static void _cleanup(void) 45static void _cleanup(void)
46{ 46{
47 int i; 47 int i;
48 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 48 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
49} 49}
50 50
51#define PI (double) 3.141592654 51#define PI (double) 3.141592654
@@ -87,11 +87,11 @@ static void _loop(double t, int f)
87 for (i = 0; i < OBNUM; i++) 87 for (i = 0; i < OBNUM; i++)
88 { 88 {
89 o = o_images[i]; 89 o = o_images[i];
90 evas_obj_line_xy_get(o, &ox1, &oy1, &ox2, &oy2); 90 evas_object_line_xy_get(o, &ox1, &oy1, &ox2, &oy2);
91 91
92 _rotate_point(&ox1, &oy1, i); 92 _rotate_point(&ox1, &oy1, i);
93 _rotate_point(&ox2, &oy2, i); 93 _rotate_point(&ox2, &oy2, i);
94 evas_obj_line_xy_set(o, ox1, oy1, ox2, oy2); 94 evas_object_line_xy_set(o, ox1, oy1, ox2, oy2);
95 } 95 }
96 FPS_STD(NAME); 96 FPS_STD(NAME);
97} 97}
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index 5fbadf5..b25d0f7 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -85,7 +85,7 @@ static void _setup(void)
85static void _cleanup(void) 85static void _cleanup(void)
86{ 86{
87 int i; 87 int i;
88 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 88 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
89} 89}
90 90
91/* loop - do things */ 91/* loop - do things */
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index e3ba82a..e5dc63c 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index 626b7d0..0028ad7 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -49,7 +49,7 @@ static void _setup(void)
49static void _cleanup(void) 49static void _cleanup(void)
50{ 50{
51 int i; 51 int i;
52 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 52 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 01ce228..75bb523 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -27,16 +27,16 @@ 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 = evas_object_text_add(evas);
31 o_texts[i] = o; 31 o_texts[i] = o;
32 efl_text_properties_font_set(o, "Vera-Bold", 20); 32 efl_text_properties_font_set(o, "Vera-Bold", 20);
33 efl_text_set(o, "This is a test string"); 33 efl_text_set(o, "This is a test string");
34 evas_obj_text_style_set(o, st); 34 evas_object_text_style_set(o, st);
35 efl_gfx_color_set(o, 255, 255, 255, 255); 35 efl_gfx_color_set(o, 255, 255, 255, 255);
36 evas_obj_text_shadow_color_set(o, 0, 0, 0, 24); 36 evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
37 evas_obj_text_glow_color_set(o, 100, 80, 40, 100); 37 evas_object_text_glow_color_set(o, 100, 80, 40, 100);
38 evas_obj_text_glow2_color_set(o, 50, 10, 5, 50); 38 evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
39 evas_obj_text_outline_color_set(o, 0, 0, 0, 255); 39 evas_object_text_outline_color_set(o, 0, 0, 0, 255);
40 efl_gfx_visible_set(o, EINA_TRUE); 40 efl_gfx_visible_set(o, EINA_TRUE);
41 st++; 41 st++;
42 } 42 }
@@ -62,7 +62,7 @@ static void _setup(void)
62static void _cleanup(void) 62static void _cleanup(void)
63{ 63{
64 int i; 64 int i;
65 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 65 for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
66} 66}
67 67
68/* loop - do things */ 68/* loop - do things */
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 0d58c4a..34a39aa 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 = evas_object_text_add(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 *))],
@@ -71,7 +71,7 @@ static void _setup(void)
71static void _cleanup(void) 71static void _cleanup(void)
72{ 72{
73 int i; 73 int i;
74 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 74 for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
75} 75}
76 76
77/* loop - do things */ 77/* loop - do things */
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index 51dcaf6..8471b04 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index fac3244..b8bd673 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -45,7 +45,7 @@ static void _setup(void)
45static void _cleanup(void) 45static void _cleanup(void)
46{ 46{
47 int i; 47 int i;
48 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 48 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
49} 49}
50 50
51/* loop - do things */ 51/* loop - do things */
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index 31fef38..735226e 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 46 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index 214602b..a26fb6b 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index fbd2d46..8e976b7 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 568c011..af98b49 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -45,7 +45,7 @@ static void _setup(void)
45static void _cleanup(void) 45static void _cleanup(void)
46{ 46{
47 int i; 47 int i;
48 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 48 for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
49} 49}
50 50
51/* loop - do things */ 51/* loop - do things */
diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c
index dbdab77..dd4867d 100644
--- a/src/bin/snapshot_widgets_file_icons.c
+++ b/src/bin/snapshot_widgets_file_icons.c
@@ -62,13 +62,13 @@ static void _setup(void)
62 efl_gfx_position_set(o, x + 8, y); 62 efl_gfx_position_set(o, x + 8, y);
63 efl_gfx_visible_set(o, EINA_TRUE); 63 efl_gfx_visible_set(o, EINA_TRUE);
64 64
65 o = eo_add(EVAS_TEXT_CLASS, evas); 65 o = evas_object_text_add(evas);
66 o_texts[i] = o; 66 o_texts[i] = o;
67 efl_text_properties_font_set(o, "Vera-Bold", 10); 67 efl_text_properties_font_set(o, "Vera-Bold", 10);
68 efl_text_set(o, icons[i % 13]); 68 efl_text_set(o, icons[i % 13]);
69 evas_obj_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW); 69 evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
70 efl_gfx_color_set(o, 255, 255, 255, 255); 70 efl_gfx_color_set(o, 255, 255, 255, 255);
71 evas_obj_text_shadow_color_set(o, 0, 0, 0, 24); 71 evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
72 efl_gfx_visible_set(o, EINA_TRUE); 72 efl_gfx_visible_set(o, EINA_TRUE);
73 efl_gfx_size_get(o, &tw, &th); 73 efl_gfx_size_get(o, &tw, &th);
74 cent = ICON_SIZE + 16 - tw / 2; 74 cent = ICON_SIZE + 16 - tw / 2;
@@ -102,10 +102,10 @@ static void _cleanup(void)
102 int i; 102 int i;
103 for (i = 0; i < NUM; i++) 103 for (i = 0; i < NUM; i++)
104 { 104 {
105 eo_del(o_images[i]); 105 eo_unref(o_images[i]);
106 eo_del(o_texts[i]); 106 eo_unref(o_texts[i]);
107 } 107 }
108 eo_del(o_snap); 108 eo_unref(o_snap);
109} 109}
110 110
111/* loop - do things */ 111/* loop - do things */
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index 31fa0d5..2757ca5 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 = evas_object_text_add(evas);
29 o_texts[i] = o; 29 o_texts[i] = o;
30 efl_text_properties_font_set(o, "Vera-Bold", 20); 30 efl_text_properties_font_set(o, "Vera-Bold", 20);
31 efl_text_set(o, "This is a test string"); 31 efl_text_set(o, "This is a test string");
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 42 for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index aa7b594..d64c6e0 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 = evas_object_text_add(evas);
36 o_texts[i] = o; 36 o_texts[i] = o;
37 efl_text_properties_font_set(o, "Vera-Bold", 20); 37 efl_text_properties_font_set(o, "Vera-Bold", 20);
38 snprintf(buf, sizeof(buf), "%s %s %s %s.", 38 snprintf(buf, sizeof(buf), "%s %s %s %s.",
@@ -57,7 +57,7 @@ static void _setup(void)
57static void _cleanup(void) 57static void _cleanup(void)
58{ 58{
59 int i; 59 int i;
60 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 60 for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
61} 61}
62 62
63/* loop - do things */ 63/* loop - do things */
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 44c6576..593e823 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -27,16 +27,16 @@ 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 = evas_object_text_add(evas);
31 o_texts[i] = o; 31 o_texts[i] = o;
32 efl_text_properties_font_set(o, "Vera-Bold", 20); 32 efl_text_properties_font_set(o, "Vera-Bold", 20);
33 efl_text_set(o, "This is a test string"); 33 efl_text_set(o, "This is a test string");
34 evas_obj_text_style_set(o, st); 34 evas_object_text_style_set(o, st);
35 efl_gfx_color_set(o, 255, 255, 255, 255); 35 efl_gfx_color_set(o, 255, 255, 255, 255);
36 evas_obj_text_shadow_color_set(o, 0, 0, 0, 24); 36 evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
37 evas_obj_text_glow_color_set(o, 100, 80, 40, 100); 37 evas_object_text_glow_color_set(o, 100, 80, 40, 100);
38 evas_obj_text_glow2_color_set(o, 50, 10, 5, 50); 38 evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
39 evas_obj_text_outline_color_set(o, 0, 0, 0, 255); 39 evas_object_text_outline_color_set(o, 0, 0, 0, 255);
40 efl_gfx_visible_set(o, EINA_TRUE); 40 efl_gfx_visible_set(o, EINA_TRUE);
41 st++; 41 st++;
42 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; 42 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
@@ -48,7 +48,7 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 51 for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
52} 52}
53 53
54/* loop - do things */ 54/* loop - do things */
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 48e4fd4..f13307e 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 = evas_object_text_add(evas);
38 o_texts[i] = o; 38 o_texts[i] = o;
39 efl_text_properties_font_set(o, "Vera-Bold", 20); 39 efl_text_properties_font_set(o, "Vera-Bold", 20);
40 snprintf(buf, sizeof(buf), "%s %s %s %s.", 40 snprintf(buf, sizeof(buf), "%s %s %s %s.",
@@ -43,12 +43,12 @@ static void _setup(void)
43 strs[rnd() % (sizeof(strs) / sizeof(char *))], 43 strs[rnd() % (sizeof(strs) / sizeof(char *))],
44 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 44 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
45 efl_text_set(o, buf); 45 efl_text_set(o, buf);
46 evas_obj_text_style_set(o, st); 46 evas_object_text_style_set(o, st);
47 efl_gfx_color_set(o, 255, 255, 255, 255); 47 efl_gfx_color_set(o, 255, 255, 255, 255);
48 evas_obj_text_shadow_color_set(o, 0, 0, 0, 24); 48 evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
49 evas_obj_text_glow_color_set(o, 100, 80, 40, 100); 49 evas_object_text_glow_color_set(o, 100, 80, 40, 100);
50 evas_obj_text_glow2_color_set(o, 50, 10, 5, 50); 50 evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
51 evas_obj_text_outline_color_set(o, 0, 0, 0, 255); 51 evas_object_text_outline_color_set(o, 0, 0, 0, 255);
52 efl_gfx_visible_set(o, EINA_TRUE); 52 efl_gfx_visible_set(o, EINA_TRUE);
53 st++; 53 st++;
54 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; 54 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
@@ -60,7 +60,7 @@ static void _setup(void)
60static void _cleanup(void) 60static void _cleanup(void)
61{ 61{
62 int i; 62 int i;
63 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 63 for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
64} 64}
65 65
66/* loop - do things */ 66/* loop - do things */
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index d5d6dac..053380d 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -58,7 +58,7 @@ static void _setup(void)
58/* cleanup */ 58/* cleanup */
59static void _cleanup(void) 59static void _cleanup(void)
60{ 60{
61 eo_del(o_text); 61 eo_unref(o_text);
62} 62}
63 63
64/* loop - do things */ 64/* loop - do things */
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index 3b7bb50..2673ced 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -119,7 +119,7 @@ static void _setup(void)
119/* cleanup */ 119/* cleanup */
120static void _cleanup(void) 120static void _cleanup(void)
121{ 121{
122 eo_del(o_text); 122 eo_unref(o_text);
123} 123}
124 124
125/* loop - do things */ 125/* loop - do things */
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index 1768c86..6be8f95 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -90,7 +90,7 @@ static void _setup(void)
90/* cleanup */ 90/* cleanup */
91static void _cleanup(void) 91static void _cleanup(void)
92{ 92{
93 eo_del(o_text); 93 eo_unref(o_text);
94} 94}
95 95
96/* loop - do things */ 96/* loop - do things */
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index 3168b76..589bb5c 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -102,7 +102,7 @@ static void _setup(void)
102/* cleanup */ 102/* cleanup */
103static void _cleanup(void) 103static void _cleanup(void)
104{ 104{
105 eo_del(o_text); 105 eo_unref(o_text);
106 o_text = NULL; 106 o_text = NULL;
107} 107}
108 108
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 18ea8d6..36286b7 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -409,7 +409,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
409 efl_gfx_visible_set(o, EINA_TRUE); 409 efl_gfx_visible_set(o, EINA_TRUE);
410 o_wallpaper = o; 410 o_wallpaper = o;
411 411
412 o = eo_add(EVAS_TEXT_CLASS, evas); 412 o = evas_object_text_add(evas);
413 efl_text_properties_font_set(o, "Vera-Bold", 10); 413 efl_text_properties_font_set(o, "Vera-Bold", 10);
414 efl_text_set(o, "EXPEDITE"); 414 efl_text_set(o, "EXPEDITE");
415 efl_gfx_stack_layer_set(o, 100); 415 efl_gfx_stack_layer_set(o, 100);
@@ -422,7 +422,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
422 efl_gfx_visible_set(o, EINA_TRUE); 422 efl_gfx_visible_set(o, EINA_TRUE);
423 o_title = o; 423 o_title = o;
424 424
425 o = eo_add(EVAS_TEXT_CLASS, evas); 425 o = evas_object_text_add(evas);
426 efl_text_properties_font_set(o, "Vera", 9); 426 efl_text_properties_font_set(o, "Vera", 9);
427 efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."); 427 efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
428 efl_gfx_stack_layer_set(o, 100); 428 efl_gfx_stack_layer_set(o, 100);
@@ -467,7 +467,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
467 efl_image_border_set(o, 7, 7, 7, 7); 467 efl_image_border_set(o, 7, 7, 7, 7);
468 o_menu_text_sel = o; 468 o_menu_text_sel = o;
469 469
470 o = eo_add(EVAS_TEXT_CLASS, evas); 470 o = evas_object_text_add(evas);
471 efl_text_properties_font_set(o, "Vera", 10); 471 efl_text_properties_font_set(o, "Vera", 10);
472 efl_text_set(o, ""); 472 efl_text_set(o, "");
473 efl_gfx_color_set(o, 0, 0, 0, 100); 473 efl_gfx_color_set(o, 0, 0, 0, 100);
diff --git a/src/bin/vg_basic_circle.c b/src/bin/vg_basic_circle.c
index a06e4ff..bd407a1 100644
--- a/src/bin/vg_basic_circle.c
+++ b/src/bin/vg_basic_circle.c
@@ -52,7 +52,7 @@ static void _cleanup(void)
52{ 52{
53 unsigned int i; 53 unsigned int i;
54 54
55 for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]); 55 for (i = 0; i < OBNUM; i++) eo_unref(o_shapes[i]);
56} 56}
57 57
58/* loop - do things */ 58/* loop - do things */
diff --git a/src/bin/vg_basic_gradient.c b/src/bin/vg_basic_gradient.c
index 1a0a0e9..1a41a6e 100644
--- a/src/bin/vg_basic_gradient.c
+++ b/src/bin/vg_basic_gradient.c
@@ -65,7 +65,7 @@ static void _cleanup(void)
65{ 65{
66 unsigned int i; 66 unsigned int i;
67 67
68 for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]); 68 for (i = 0; i < OBNUM; i++) eo_unref(o_shapes[i]);
69} 69}
70 70
71/* loop - do things */ 71/* loop - do things */
diff --git a/src/bin/vg_basic_rect.c b/src/bin/vg_basic_rect.c
index fa8a21e..ea594e0 100644
--- a/src/bin/vg_basic_rect.c
+++ b/src/bin/vg_basic_rect.c
@@ -52,7 +52,7 @@ static void _cleanup(void)
52{ 52{
53 unsigned int i; 53 unsigned int i;
54 54
55 for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]); 55 for (i = 0; i < OBNUM; i++) eo_unref(o_shapes[i]);
56} 56}
57 57
58/* loop - do things */ 58/* loop - do things */
diff --git a/src/bin/vg_scaled.c b/src/bin/vg_scaled.c
index 6ac272e..cffbba4 100644
--- a/src/bin/vg_scaled.c
+++ b/src/bin/vg_scaled.c
@@ -67,7 +67,7 @@ static void _cleanup(void)
67 67
68 for (i = 0; i < OBNUM; i++) 68 for (i = 0; i < OBNUM; i++)
69 { 69 {
70 eo_del(o_objects[i]); 70 eo_unref(o_objects[i]);
71 o_objects[i] = NULL; 71 o_objects[i] = NULL;
72 } 72 }
73} 73}
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index 25a5dd3..222ba53 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -53,13 +53,13 @@ static void _setup(void)
53 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); 53 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
54 efl_gfx_visible_set(o, EINA_TRUE); 54 efl_gfx_visible_set(o, EINA_TRUE);
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = evas_object_text_add(evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 efl_text_properties_font_set(o, "Vera-Bold", 10); 58 efl_text_properties_font_set(o, "Vera-Bold", 10);
59 efl_text_set(o, icons[i % 13]); 59 efl_text_set(o, icons[i % 13]);
60 evas_obj_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW); 60 evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
61 efl_gfx_color_set(o, 255, 255, 255, 255); 61 efl_gfx_color_set(o, 255, 255, 255, 255);
62 evas_obj_text_shadow_color_set(o, 0, 0, 0, 24); 62 evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
63 efl_gfx_visible_set(o, EINA_TRUE); 63 efl_gfx_visible_set(o, EINA_TRUE);
64 } 64 }
65 done = 0; 65 done = 0;
@@ -71,8 +71,8 @@ static void _cleanup(void)
71 int i; 71 int i;
72 for (i = 0; i < NUM; i++) 72 for (i = 0; i < NUM; i++)
73 { 73 {
74 eo_del(o_images[i]); 74 eo_unref(o_images[i]);
75 eo_del(o_texts[i]); 75 eo_unref(o_texts[i]);
76 } 76 }
77} 77}
78 78
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index 03e715b..60eee48 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -53,7 +53,7 @@ static void _setup(void)
53 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); 53 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
54 efl_gfx_visible_set(o, EINA_TRUE); 54 efl_gfx_visible_set(o, EINA_TRUE);
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = evas_object_text_add(evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 efl_text_properties_font_set(o, "Vera-Bold", 10); 58 efl_text_properties_font_set(o, "Vera-Bold", 10);
59 efl_text_set(o, icons[i % 13]); 59 efl_text_set(o, icons[i % 13]);
@@ -69,8 +69,8 @@ static void _cleanup(void)
69 int i; 69 int i;
70 for (i = 0; i < NUM; i++) 70 for (i = 0; i < NUM; i++)
71 { 71 {
72 eo_del(o_images[i]); 72 eo_unref(o_images[i]);
73 eo_del(o_texts[i]); 73 eo_unref(o_texts[i]);
74 } 74 }
75} 75}
76 76
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index 7f14482..ab50ffd 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -53,7 +53,7 @@ static void _setup(void)
53 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); 53 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
54 efl_gfx_visible_set(o, EINA_TRUE); 54 efl_gfx_visible_set(o, EINA_TRUE);
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = evas_object_text_add(evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 efl_text_properties_font_set(o, "Vera-Bold", 10); 58 efl_text_properties_font_set(o, "Vera-Bold", 10);
59 efl_text_set(o, icons[i % 13]); 59 efl_text_set(o, icons[i % 13]);
@@ -78,8 +78,8 @@ static void _cleanup(void)
78 int i; 78 int i;
79 for (i = 0; i < NUM; i++) 79 for (i = 0; i < NUM; i++)
80 { 80 {
81 eo_del(o_images[i]); 81 eo_unref(o_images[i]);
82 eo_del(o_texts[i]); 82 eo_unref(o_texts[i]);
83 } 83 }
84} 84}
85 85
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index 113cc5b..e8e2ebb 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -38,7 +38,7 @@ static void _setup(void)
38 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); 38 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
39 efl_gfx_visible_set(o, EINA_TRUE); 39 efl_gfx_visible_set(o, EINA_TRUE);
40 40
41 o = eo_add(EVAS_TEXT_CLASS, evas); 41 o = evas_object_text_add(evas);
42 o_texts[i] = o; 42 o_texts[i] = o;
43 efl_text_properties_font_set(o, "Vera-Bold", 10); 43 efl_text_properties_font_set(o, "Vera-Bold", 10);
44 efl_text_set(o, icons[i % 1]); 44 efl_text_set(o, icons[i % 1]);
@@ -54,8 +54,8 @@ static void _cleanup(void)
54 int i; 54 int i;
55 for (i = 0; i < NUM; i++) 55 for (i = 0; i < NUM; i++)
56 { 56 {
57 eo_del(o_images[i]); 57 eo_unref(o_images[i]);
58 eo_del(o_texts[i]); 58 eo_unref(o_texts[i]);
59 } 59 }
60} 60}
61 61
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index 5b631b9..bc1fdd3 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -38,7 +38,7 @@ static void _setup(void)
38 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); 38 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
39 efl_gfx_visible_set(o, EINA_TRUE); 39 efl_gfx_visible_set(o, EINA_TRUE);
40 40
41 o = eo_add(EVAS_TEXT_CLASS, evas); 41 o = evas_object_text_add(evas);
42 o_texts[i] = o; 42 o_texts[i] = o;
43 efl_text_properties_font_set(o, "Vera-Bold", 10); 43 efl_text_properties_font_set(o, "Vera-Bold", 10);
44 efl_text_set(o, icons[i % 1]); 44 efl_text_set(o, icons[i % 1]);
@@ -58,8 +58,8 @@ static void _cleanup(void)
58 int i; 58 int i;
59 for (i = 0; i < NUM; i++) 59 for (i = 0; i < NUM; i++)
60 { 60 {
61 eo_del(o_images[i]); 61 eo_unref(o_images[i]);
62 eo_del(o_texts[i]); 62 eo_unref(o_texts[i]);
63 } 63 }
64} 64}
65 65
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index be9f393..077335a 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -53,7 +53,7 @@ static void _setup(void)
53 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); 53 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
54 efl_gfx_visible_set(o, EINA_TRUE); 54 efl_gfx_visible_set(o, EINA_TRUE);
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = evas_object_text_add(evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 efl_text_properties_font_set(o, "Vera-Bold", 10); 58 efl_text_properties_font_set(o, "Vera-Bold", 10);
59 efl_text_set(o, icons[i % 13]); 59 efl_text_set(o, icons[i % 13]);
@@ -69,8 +69,8 @@ static void _cleanup(void)
69 int i; 69 int i;
70 for (i = 0; i < NUM; i++) 70 for (i = 0; i < NUM; i++)
71 { 71 {
72 eo_del(o_images[i]); 72 eo_unref(o_images[i]);
73 eo_del(o_texts[i]); 73 eo_unref(o_texts[i]);
74 } 74 }
75} 75}
76 76
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index a23ce7b..a4d3e2c 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -53,7 +53,7 @@ static void _setup(void)
53 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); 53 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
54 efl_gfx_visible_set(o, EINA_TRUE); 54 efl_gfx_visible_set(o, EINA_TRUE);
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = evas_object_text_add(evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 efl_text_properties_font_set(o, "Vera-Bold", 10); 58 efl_text_properties_font_set(o, "Vera-Bold", 10);
59 efl_text_set(o, icons[i % 13]); 59 efl_text_set(o, icons[i % 13]);
@@ -69,8 +69,8 @@ static void _cleanup(void)
69 int i; 69 int i;
70 for (i = 0; i < NUM; i++) 70 for (i = 0; i < NUM; i++)
71 { 71 {
72 eo_del(o_images[i]); 72 eo_unref(o_images[i]);
73 eo_del(o_texts[i]); 73 eo_unref(o_texts[i]);
74 } 74 }
75} 75}
76 76
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 44351b1..48b9921 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -69,7 +69,7 @@ static void _setup(void)
69 efl_gfx_size_set(o, win_w, ICON_SIZE); 69 efl_gfx_size_set(o, win_w, ICON_SIZE);
70 efl_gfx_visible_set(o, EINA_TRUE); 70 efl_gfx_visible_set(o, EINA_TRUE);
71 71
72 o = eo_add(EVAS_TEXT_CLASS, evas); 72 o = evas_object_text_add(evas);
73 o_texts[i] = o; 73 o_texts[i] = o;
74 efl_text_properties_font_set(o, "Vera-Bold", 10); 74 efl_text_properties_font_set(o, "Vera-Bold", 10);
75 efl_text_set(o, labels[i % 26]); 75 efl_text_set(o, labels[i % 26]);
@@ -85,8 +85,8 @@ static void _cleanup(void)
85 int i; 85 int i;
86 for (i = 0; i < NUM; i++) 86 for (i = 0; i < NUM; i++)
87 { 87 {
88 eo_del(o_images[i]); 88 eo_unref(o_images[i]);
89 eo_del(o_texts[i]); 89 eo_unref(o_texts[i]);
90 } 90 }
91} 91}
92 92
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index 3aa8296..bf664f1 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -69,7 +69,7 @@ static void _setup(void)
69 efl_gfx_size_set(o, win_w, ICON_SIZE); 69 efl_gfx_size_set(o, win_w, ICON_SIZE);
70 efl_gfx_visible_set(o, EINA_TRUE); 70 efl_gfx_visible_set(o, EINA_TRUE);
71 71
72 o = eo_add(EVAS_TEXT_CLASS, evas); 72 o = evas_object_text_add(evas);
73 o_texts[i] = o; 73 o_texts[i] = o;
74 efl_text_properties_font_set(o, "Vera-Bold", 10); 74 efl_text_properties_font_set(o, "Vera-Bold", 10);
75 efl_text_set(o, labels[i % 26]); 75 efl_text_set(o, labels[i % 26]);
@@ -93,8 +93,8 @@ static void _cleanup(void)
93 int i; 93 int i;
94 for (i = 0; i < NUM; i++) 94 for (i = 0; i < NUM; i++)
95 { 95 {
96 eo_del(o_images[i]); 96 eo_unref(o_images[i]);
97 eo_del(o_texts[i]); 97 eo_unref(o_texts[i]);
98 } 98 }
99} 99}
100 100
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index f59cbe1..dcf8593 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -69,7 +69,7 @@ static void _setup(void)
69 efl_gfx_size_set(o, win_w, ICON_SIZE); 69 efl_gfx_size_set(o, win_w, ICON_SIZE);
70 efl_gfx_visible_set(o, EINA_TRUE); 70 efl_gfx_visible_set(o, EINA_TRUE);
71 71
72 o = eo_add(EVAS_TEXT_CLASS, evas); 72 o = evas_object_text_add(evas);
73 o_texts[i] = o; 73 o_texts[i] = o;
74 efl_text_properties_font_set(o, "Vera-Bold", 10); 74 efl_text_properties_font_set(o, "Vera-Bold", 10);
75 efl_text_set(o, labels[i % 26]); 75 efl_text_set(o, labels[i % 26]);
@@ -85,8 +85,8 @@ static void _cleanup(void)
85 int i; 85 int i;
86 for (i = 0; i < NUM; i++) 86 for (i = 0; i < NUM; i++)
87 { 87 {
88 eo_del(o_images[i]); 88 eo_unref(o_images[i]);
89 eo_del(o_texts[i]); 89 eo_unref(o_texts[i]);
90 } 90 }
91} 91}
92 92
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index ad3d866..4f66149 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -69,7 +69,7 @@ static void _setup(void)
69 efl_gfx_size_set(o, win_w, ICON_SIZE); 69 efl_gfx_size_set(o, win_w, ICON_SIZE);
70 efl_gfx_visible_set(o, EINA_TRUE); 70 efl_gfx_visible_set(o, EINA_TRUE);
71 71
72 o = eo_add(EVAS_TEXT_CLASS, evas); 72 o = evas_object_text_add(evas);
73 o_texts[i] = o; 73 o_texts[i] = o;
74 efl_text_properties_font_set(o, "Vera-Bold", 10); 74 efl_text_properties_font_set(o, "Vera-Bold", 10);
75 efl_text_set(o, labels[i % 26]); 75 efl_text_set(o, labels[i % 26]);
@@ -93,8 +93,8 @@ static void _cleanup(void)
93 int i; 93 int i;
94 for (i = 0; i < NUM; i++) 94 for (i = 0; i < NUM; i++)
95 { 95 {
96 eo_del(o_images[i]); 96 eo_unref(o_images[i]);
97 eo_del(o_texts[i]); 97 eo_unref(o_texts[i]);
98 } 98 }
99} 99}
100 100
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index 52b6e01..10764ca 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -97,7 +97,7 @@ static void _setup(void)
97 efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); 97 efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
98 efl_gfx_visible_set(o, EINA_TRUE); 98 efl_gfx_visible_set(o, EINA_TRUE);
99 99
100 o = eo_add(EVAS_TEXT_CLASS, evas); 100 o = evas_object_text_add(evas);
101 o_texts[i] = o; 101 o_texts[i] = o;
102 efl_text_properties_font_set(o, "Vera-Bold", 10); 102 efl_text_properties_font_set(o, "Vera-Bold", 10);
103 efl_text_set(o, labels[i % 26]); 103 efl_text_set(o, labels[i % 26]);
@@ -113,9 +113,9 @@ static void _cleanup(void)
113 int i; 113 int i;
114 for (i = 0; i < NUM; i++) 114 for (i = 0; i < NUM; i++)
115 { 115 {
116 eo_del(o_images[i]); 116 eo_unref(o_images[i]);
117 eo_del(o_icons[i]); 117 eo_unref(o_icons[i]);
118 eo_del(o_texts[i]); 118 eo_unref(o_texts[i]);
119 } 119 }
120} 120}
121 121
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index 30bb97f..ef6f415 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -97,7 +97,7 @@ static void _setup(void)
97 efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); 97 efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
98 efl_gfx_visible_set(o, EINA_TRUE); 98 efl_gfx_visible_set(o, EINA_TRUE);
99 99
100 o = eo_add(EVAS_TEXT_CLASS, evas); 100 o = evas_object_text_add(evas);
101 o_texts[i] = o; 101 o_texts[i] = o;
102 efl_text_properties_font_set(o, "Vera-Bold", 10); 102 efl_text_properties_font_set(o, "Vera-Bold", 10);
103 efl_text_set(o, labels[i % 26]); 103 efl_text_set(o, labels[i % 26]);
@@ -130,9 +130,9 @@ static void _cleanup(void)
130 int i; 130 int i;
131 for (i = 0; i < NUM; i++) 131 for (i = 0; i < NUM; i++)
132 { 132 {
133 eo_del(o_images[i]); 133 eo_unref(o_images[i]);
134 eo_del(o_icons[i]); 134 eo_unref(o_icons[i]);
135 eo_del(o_texts[i]); 135 eo_unref(o_texts[i]);
136 } 136 }
137} 137}
138 138
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index 7eb4672..bc07eb8 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -97,7 +97,7 @@ static void _setup(void)
97 efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); 97 efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
98 efl_gfx_visible_set(o, EINA_TRUE); 98 efl_gfx_visible_set(o, EINA_TRUE);
99 99
100 o = eo_add(EVAS_TEXT_CLASS, evas); 100 o = evas_object_text_add(evas);
101 o_texts[i] = o; 101 o_texts[i] = o;
102 efl_text_properties_font_set(o, "Vera-Bold", 10); 102 efl_text_properties_font_set(o, "Vera-Bold", 10);
103 efl_text_set(o, labels[i % 26]); 103 efl_text_set(o, labels[i % 26]);
@@ -111,9 +111,9 @@ static void _setup(void)
111static void _cleanup(void) 111static void _cleanup(void)
112{ 112{
113 int i; 113 int i;
114 for (i = 0; i < NUM; i++) eo_del(o_images[i]); 114 for (i = 0; i < NUM; i++) eo_unref(o_images[i]);
115 for (i = 0; i < NUM; i++) eo_del(o_icons[i]); 115 for (i = 0; i < NUM; i++) eo_unref(o_icons[i]);
116 for (i = 0; i < NUM; i++) eo_del(o_texts[i]); 116 for (i = 0; i < NUM; i++) eo_unref(o_texts[i]);
117} 117}
118 118
119/* loop - do things */ 119/* loop - do things */
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 29136e1..fde06e7 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -97,7 +97,7 @@ static void _setup(void)
97 efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); 97 efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
98 efl_gfx_visible_set(o, EINA_TRUE); 98 efl_gfx_visible_set(o, EINA_TRUE);
99 99
100 o = eo_add(EVAS_TEXT_CLASS, evas); 100 o = evas_object_text_add(evas);
101 o_texts[i] = o; 101 o_texts[i] = o;
102 efl_text_properties_font_set(o, "Vera-Bold", 10); 102 efl_text_properties_font_set(o, "Vera-Bold", 10);
103 efl_text_set(o, labels[i % 26]); 103 efl_text_set(o, labels[i % 26]);
@@ -129,9 +129,9 @@ static void _cleanup(void)
129 int i; 129 int i;
130 for (i = 0; i < NUM; i++) 130 for (i = 0; i < NUM; i++)
131 { 131 {
132 eo_del(o_images[i]); 132 eo_unref(o_images[i]);
133 eo_del(o_icons[i]); 133 eo_unref(o_icons[i]);
134 eo_del(o_texts[i]); 134 eo_unref(o_texts[i]);
135 } 135 }
136} 136}
137 137