UI main loop: Fix indentation

Fix support of --count from command line
expedite would never exit after N loops
2014-10-22 16:08:13 +09:00 · 2014-10-22 15:58:20 +09:00 · 2014-09-04 14:23:38 +02:00 · 2014-09-04 13:55:21 +02:00 · 2014-09-04 13:50:44 +02:00
101 changed files with 209 additions and 184 deletions
--- a/src/bin/about.c
+++ b/src/bin/about.c
@ -8,7 +8,7 @@ _setup(void)
   Evas_Object *o;
   Evas_Textblock_Style *st;

-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
   eo_do(o, evas_obj_position_set(10, 40),
         evas_obj_size_set(win_w - 20, win_h - 50),
         evas_obj_visibility_set(EINA_TRUE));
--- a/src/bin/expedite-cmp
+++ b/src/bin/expedite-cmp
@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2

 import sys
 import os
--- a/src/bin/font_effect_blur_alpha.c
+++ b/src/bin/font_effect_blur_alpha.c
@ -1,3 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <Evas.h>
+
+#if EVAS_VERSION_MAJOR >= 1 && EVAS_VERSION_MINOR >= 11
+
 #undef FNAME
 #undef NAME
 #undef ICON
@ -98,3 +106,5 @@ void FNAME(void)
 #undef FNAME
 #undef NAME
 #undef ICON
+
+#endif
--- a/src/bin/font_effect_blur_color.c
+++ b/src/bin/font_effect_blur_color.c
@ -1,3 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <Evas.h>
+
+#if EVAS_VERSION_MAJOR >= 1 && EVAS_VERSION_MINOR >= 11
+
 #undef FNAME
 #undef NAME
 #undef ICON
@ -100,3 +108,6 @@ void FNAME(void)
 #undef FNAME
 #undef NAME
 #undef ICON
+
+#endif
+
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("bar.png"), NULL),
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("pan.png"), NULL),
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@ -25,7 +25,7 @@ static void _setup(void)
     {
        int a;

-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@ -24,7 +24,7 @@ static void _setup(void)
   for (i = 0; i < OBNUM; i++)
     {
        int a;
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        a = rnd()&0xff;
        eo_do(o,
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@ -25,7 +25,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < MANYNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        n = rnd() % 100;
        w = 3 + ((n * (60 - 3)) / 100);
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@ -24,7 +24,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i < (OBNUM / 2))
          {
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@ -27,7 +27,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i < (OBNUM / 2))
          {
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@ -27,7 +27,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i < (OBNUM / 2))
          {
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@ -27,7 +27,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i < (OBNUM / 2))
          {
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@ -24,7 +24,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i & 0x1)
          {
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@ -27,7 +27,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i & 0x1)
          {
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@ -27,7 +27,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i & 0x1)
          {
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@ -27,7 +27,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i & 0x1)
          {
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@ -24,7 +24,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i > (OBNUM / 2))
          {
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@ -27,7 +27,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i > (OBNUM / 2))
          {
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@ -27,7 +27,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i > (OBNUM / 2))
          {
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@ -27,7 +27,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        if (i > (OBNUM / 2))
          {
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("frame.png"), NULL),
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@ -25,7 +25,7 @@ static void _setup(void)
     {
        int a;

-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@ -25,7 +25,7 @@ static void _setup(void)
     {
        int a;

-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("bar.png"), NULL),
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@ -22,7 +22,7 @@ static void _setup(void)
 {
   Evas_Object *o;

-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
   o_images[0] = o;
   eo_do(o,
         evas_obj_image_file_set(build_path("im1.png"), NULL),
@ -30,7 +30,7 @@ static void _setup(void)
         evas_obj_size_set(720, 420),
         evas_obj_visibility_set(EINA_TRUE));

-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
   o_images[1] = o;
   eo_do(o,
         evas_obj_image_file_set(build_path("im2.png"), NULL),
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < 1; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < 1; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@ -27,7 +27,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < 1; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@ -27,7 +27,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < 1; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@ -27,7 +27,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < 1; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@ -27,7 +27,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < 1; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
     {
        Evas_Object *o;
        char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        c->side[i].o = o;
        snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
        eo_do(o,
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
     {
        Evas_Object *o;
        char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        c->side[i].o = o;
        snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
        eo_do(o,
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
     {
        Evas_Object *o;
        char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        c->side[i].o = o;
        snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
        eo_do(o,
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
     {
        Evas_Object *o;
        char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        c->side[i].o = o;
        snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
        eo_do(o,
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
     {
        Evas_Object *o;
        char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        c->side[i].o = o;
        snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
        eo_do(o,
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
     {
        Evas_Object *o;
        char buf[256];
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        c->side[i].o = o;
        snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
        eo_do(o,
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@ -29,7 +29,7 @@ static void _setup(void)
     {
        char buf[256];

-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
        eo_do(o,
@ -39,7 +39,7 @@ static void _setup(void)
              evas_obj_image_smooth_scale_set(0),
              evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_reflec[i] = o;
        snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
        eo_do(o,
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("logo.png"), NULL),
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
              evas_obj_image_fill_set(0, 0, 120, 160),
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < (OBNUM / 2); i++)
     {
-	o = eo_add(EVAS_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
 	o_images[i] = o;
        eo_do(o,
              evas_obj_image_file_set(build_path("image.png"), NULL),
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@ -24,7 +24,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < 1; i++)
     {
-	o = eo_add(EVAS_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
 	o_images[i] = o;
 	eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
 	         evas_obj_image_fill_set(0, 0, 640, 480),
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@ -26,7 +26,7 @@ static void _setup(void)
     {
 	int r, g, b, a;

-        o = eo_add(EVAS_LINE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_LINE_CLASS, evas);
 	o_images[i] = o;
 	a = (rnd()&0xff) / 2;
 	r = ((rnd()&0xff) * a) / 255;
--- a/src/bin/main.c
+++ b/src/bin/main.c
@ -9,6 +9,7 @@ const char *profile = "n800";
 const char *choosen_engine = NULL;
 int win_w = 720, win_h = 420;
 int loops = LOOPS;
+int one_test = 0;
 Eina_Bool fullscreen = EINA_FALSE;
 Eina_Bool cmp_report = EINA_FALSE;

@ -1322,6 +1323,7 @@ main(int argc, char **argv)
     }
   else if (test > 0)
     {
+        one_test = 1;
        ui_num(test);
     }

--- a/src/bin/main.h
+++ b/src/bin/main.h
@ -47,6 +47,7 @@ extern "C"
 extern Evas *evas;
 extern int   win_w, win_h;
 extern int   loops;
+extern int   one_test;
 extern const char *choosen_engine;
 extern Eina_Bool fullscreen;
 extern Eina_Bool cmp_report;
@ -92,8 +93,8 @@ int          engine_abort(void);
       { \
 	  double fps; \
 	  fps = (double)f / t; \
-	  ui_fps(fps); \
 	  printf("%4.2f , %s\n", fps, x); \
+	  ui_fps(fps); \
 	  done = 1; \
       }

--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@ -73,7 +73,7 @@ static void _setup(void)
     {
 	int r, g, b, a;

-        o = eo_add(EVAS_POLYGON_CLASS, evas);
+        o = eo_add(EVAS_OBJ_POLYGON_CLASS, evas);
 	o_images[i] = o;
 	a = (rnd()&0xff) / 2;
 	r = ((rnd()&0xff) * a) / 255;
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@ -22,7 +22,7 @@ static void _setup(void)
   int i;
   Evas_Object *o,*src;

-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
   eo_do(o,
         evas_obj_image_file_set(build_path("logo.png"), NULL),
         evas_obj_image_fill_set(0, 0, 120, 160),
@ -33,7 +33,7 @@ static void _setup(void)

   for (i = 1; i < OBNUM; i++)
     {
-	o = eo_add(EVAS_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
 	o_images[i] = o;
        eo_do(o,
              evas_obj_image_source_set(src),
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@ -26,7 +26,7 @@ static void _setup(void)
   int i;
   Evas_Object *o,*src;

-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
   eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
         evas_obj_image_fill_set(0, 0, 120, 160),
         evas_obj_size_set(120, 160),
@ -35,7 +35,7 @@ static void _setup(void)

   for (i = 0; i < OBNUM / 2; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_source_set(src, NULL),
              evas_obj_size_set(120, 160),
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@ -27,11 +27,11 @@ static void _setup(void)
   st = EVAS_TEXT_STYLE_SHADOW;
   for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
     {
-	o = eo_add(EVAS_TEXT_CLASS, evas);
+	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
 	o_texts[i] = o;
        eo_do(o,
              evas_obj_text_font_set("Vera-Bold", 20),
-              evas_obj_text_set("This is a test string"),
+              evas_obj_text_text_set("This is a test string"),
              evas_obj_text_style_set(st),
              evas_obj_color_set(255, 255, 255, 255),
              evas_obj_text_shadow_color_set(0, 0, 0, 24),
@ -46,7 +46,7 @@ static void _setup(void)
   for (  ; i < OBNUM ; i ++)
     {
 	s = o_texts[i % st];
-	o = eo_add(EVAS_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
 	o_texts[i] = o;
        eo_do(o, evas_obj_image_source_set(s));
        /* FIXME s == NULL*/
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@ -30,7 +30,7 @@ static void _setup(void)
 	"Fiddly", "Family", "Lair", "Monkeys", "Magazine"
   };
   srnd();
-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
   o_texts[0] = o;
   snprintf(buf, sizeof(buf), "%s %s %s %s.",
            strs[rnd() % (sizeof(strs) / sizeof(char *))],
@ -40,7 +40,7 @@ static void _setup(void)

   eo_do(o,
         evas_obj_text_font_set("Vera-Bold", 20),
-         evas_obj_text_set(buf),
+         evas_obj_text_text_set(buf),
         evas_obj_color_set(0, 0, 0, 255),
         evas_obj_size_get(&w, &h));
   x = (win_w / 2) - (w / 2);
@ -52,7 +52,7 @@ static void _setup(void)
         evas_obj_visibility_set(EINA_TRUE));
   for (i = 1  ; i < OBNUM ; i ++)
     {
-	o = eo_add(EVAS_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
 	o_texts[i] = o;
 	eo_do(o,
              evas_obj_image_source_set(o_texts[0]));
@ -93,7 +93,7 @@ static void _loop(double t, int f)
            strs[rnd() % (sizeof(strs) / sizeof(char *))],
            strs[rnd() % (sizeof(strs) / sizeof(char *))]);
   eo_do(o_texts[0],
-         evas_obj_text_set(buf),
+         evas_obj_text_text_set(buf),
         evas_obj_size_get(&w, &h));
   for (i = 1; i < OBNUM; i++)
     {
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@ -26,7 +26,7 @@ static void _setup(void)
     {
 	int r, g, b, a;

-	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = rnd()&0xff;
 	r = ((rnd()&0xff) * a) / 255;
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@ -29,7 +29,7 @@ static void _setup(void)
     {
 	int r, g, b, a;

-	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = rnd()&0xff;
 	r = ((rnd()&0xff) * a) / 255;
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@ -26,7 +26,7 @@ static void _setup(void)
     {
 	int r, g, b, a;

-	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
        a = 256 - (1 << ((rnd() % 8) + 1));
        if (a < 128) a = 128;
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@ -29,7 +29,7 @@ static void _setup(void)
     {
 	int r, g, b, a;

-	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
        a = 256 - (1 << ((rnd() % 8) + 1));
        if (a < 128) a = 128;
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@ -26,7 +26,7 @@ static void _setup(void)
     {
 	int r, g, b, a;

-	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = 0xff;
 	r = ((rnd()&0xff) * a) / 255;
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@ -29,7 +29,7 @@ static void _setup(void)
     {
 	int r, g, b, a;

-	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = 0xff;
 	r = ((rnd()&0xff) * a) / 255;
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@ -25,10 +25,10 @@ static void _setup(void)

   for (i = 0; i < OBNUM; i++)
     {
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
-              evas_obj_text_set("This is a test string"),
+              evas_obj_text_text_set("This is a test string"),
              evas_obj_color_set(0, 0, 0, 255),
              evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@ -32,7 +32,7 @@ static void _setup(void)
   srnd();
   for (i = 0; i < OBNUM; i++)
     {
-	o = eo_add(EVAS_TEXT_CLASS, evas);
+	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
 	o_texts[i] = o;
 	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
        snprintf(buf, sizeof(buf), "%s %s %s %s.",
@ -40,7 +40,7 @@ static void _setup(void)
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-	eo_do(o, evas_obj_text_set(buf),
+	eo_do(o, evas_obj_text_text_set(buf),
 	         evas_obj_color_set(0, 0, 0, 255),
 	         evas_obj_size_get(&w, &h));
 	x = (win_w / 2) - (w / 2);
@ -77,7 +77,7 @@ static void _loop(double t, int f)
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-	eo_do(o_texts[i], evas_obj_text_set(buf));
+	eo_do(o_texts[i], evas_obj_text_text_set(buf));
     }
   FPS_STD(NAME);
 }
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@ -27,11 +27,11 @@ static void _setup(void)
   st = EVAS_TEXT_STYLE_SHADOW;
   for (i = 0; i < OBNUM; i++)
     {
-	o = eo_add(EVAS_TEXT_CLASS, evas);
+	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
 	o_texts[i] = o;
        eo_do(o,
              evas_obj_text_font_set("Vera-Bold", 20),
-              evas_obj_text_set("This is a test string"),
+              evas_obj_text_text_set("This is a test string"),
              evas_obj_text_style_set(st),
              evas_obj_color_set(255, 255, 255, 255),
              evas_obj_text_shadow_color_set(0, 0, 0, 24),
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@ -34,7 +34,7 @@ static void _setup(void)
   st = EVAS_TEXT_STYLE_SHADOW;
   for (i = 0; i < OBNUM; i++)
     {
-	o = eo_add(EVAS_TEXT_CLASS, evas);
+	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
 	o_texts[i] = o;
 	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
 	snprintf(buf, sizeof(buf), "%s %s %s %s.",
@ -42,7 +42,7 @@ static void _setup(void)
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-	eo_do(o, evas_obj_text_set(buf),
+	eo_do(o, evas_obj_text_text_set(buf),
 	         evas_obj_text_style_set(st),
 	         evas_obj_color_set(255, 255, 255, 255),
 	         evas_obj_text_shadow_color_set(0, 0, 0, 24),
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   Evas_Textblock_Style *st;

-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
   o_text = o;
   st = evas_textblock_style_new();
   evas_textblock_style_set
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   Evas_Textblock_Style *st;

-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
   o_text = o;
   st = evas_textblock_style_new();
   evas_textblock_style_set
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   Evas_Textblock_Style *st;

-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
   o_text = o;
   st = evas_textblock_style_new();
   evas_textblock_style_set
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@ -23,7 +23,7 @@ static void _setup(void)
   Evas_Object *o;
   Evas_Textblock_Style *st;

-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
   o_text = o;
   st = evas_textblock_style_new();
   evas_textblock_style_set
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@ -360,7 +360,7 @@ _ui_menu_item_full_add(Eina_Bool test,
   Menu_Item *mi;

   mi = malloc(sizeof(Menu_Item));
-   mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas);
+   mi->o_icon = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
   eo_unref(mi->o_icon);
   eo_do(mi->o_icon, evas_obj_image_file_set(build_path(icon), NULL),
         evas_obj_size_set(32, 32),
@ -390,7 +390,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
   win_w = ui_w;
   win_h = ui_h;

-   o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
   eo_unref(o);
   eo_do(o, evas_obj_position_set(0, 0),
         evas_obj_size_set(win_w, win_h),
@ -401,7 +401,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
         eo_event_callback_array_add(ui_callbacks(), NULL));
   o_bg = o;

-   o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
   eo_unref(o);
   eo_do(o, evas_obj_position_set(0, 0),
         evas_obj_size_set(win_w, win_h),
@ -410,10 +410,10 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
         evas_obj_visibility_set(EINA_TRUE));
   o_wallpaper = o;

-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
   eo_unref(o);
   eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-         evas_obj_text_set("EXPEDITE"),
+         evas_obj_text_text_set("EXPEDITE"),
         evas_obj_layer_set(100),
         evas_obj_color_set(0, 0, 0, 100),
         evas_obj_pass_events_set(1),
@ -424,10 +424,10 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
         evas_obj_visibility_set(EINA_TRUE));
   o_title = o;

-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
   eo_unref(o);
   eo_do(o, evas_obj_text_font_set("Vera", 9),
-         evas_obj_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
+         evas_obj_text_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
         evas_obj_layer_set(100),
         evas_obj_color_set(0, 0, 0, 60),
         evas_obj_pass_events_set(1),
@ -438,7 +438,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
         evas_obj_visibility_set(EINA_TRUE));
   o_byline = o;

-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
   eo_unref(o);
   eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
         evas_obj_image_file_set(build_path("e-logo.png"), NULL),
@ -449,7 +449,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
         evas_obj_visibility_set(EINA_TRUE));
   o_menu_logo = o;

-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
   eo_unref(o);
   eo_do(o, evas_obj_position_set(win_w - 128, - 128),
         evas_obj_image_fill_set(0, 0, 256, 256),
@ -457,7 +457,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
         evas_obj_visibility_set(EINA_TRUE));
   o_menu_icon = o;

-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
   eo_unref(o);
   eo_do(o, evas_obj_position_set(0, 0),
         evas_obj_image_file_set(build_path("icon_sel.png"), NULL),
@ -465,7 +465,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
         evas_obj_image_fill_set(0, 0, 48, 48));
   o_menu_icon_sel = o;

-   o = eo_add(EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
   eo_unref(o);
   eo_do(o, evas_obj_position_set(0, 0),
         evas_obj_image_file_set(build_path("text_sel.png"), NULL),
@ -474,10 +474,10 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
         evas_obj_image_border_set(7, 7, 7, 7));
   o_menu_text_sel = o;

-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
   eo_unref(o);
   eo_do(o, evas_obj_text_font_set("Vera", 10),
-         evas_obj_text_set(""),
+         evas_obj_text_text_set(""),
         evas_obj_color_set(0, 0, 0, 100),
         evas_obj_pass_events_set(1),
         evas_obj_size_get(&w, &h));
@ -514,6 +514,7 @@ ui_num(int n)
        if (!mi->test)
          return;
        menu_sel = n;
+        if (one_test) test_item = menu_sel;
        _ui_select();
     }
 }
@ -610,7 +611,7 @@ ui_loop(void *data EINA_UNUSED)

                  o = o_menu_title;
                  eo_do(o, evas_obj_color_set(a, a, a, a),
-                        evas_obj_text_set(mi->text),
+                        evas_obj_text_text_set(mi->text),
                        evas_obj_size_get(&tw, &th));
                  x = (win_w - tw) / 2;
                  y = (win_h / 2) + len + 48;
@ -649,7 +650,7 @@ ui_menu(void)
 {
   eo_do(o_title, evas_obj_visibility_set(EINA_TRUE));
   eo_do(o_byline, evas_obj_visibility_set(EINA_TRUE),
-         evas_obj_text_set
+         evas_obj_text_text_set
         ("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."));
   menu_active = 1;
   key_func = NULL;
@ -724,7 +725,7 @@ ui_fps(double fps)

        test_item++;
        mi = eina_list_nth(menu, test_item);
-        if (!mi->test)
+        if (one_test || !mi->test)
          {
             char datestr[1024];
             struct tm *tim;
@ -766,29 +767,29 @@ ui_fps(double fps)
                      loops,
                      choosen_engine,
                      fullscreen);
-        else
-          printf("\n#####Test Result#####\n"
-                 "evas fps speed: %5.2f\n"
-                 "evas fps speed(weighted): %5.2f\n"
-                 "testcase count: %i\n"
-                 "date: %s\n"
-                 "evas version: %i.%i.%i.%i\n"
-                 "profile: %s\n"
-                 "window size: %i, %i\n"
-                 "loop count: %i\n"
-                 "engine: %s\n"
-                 "full screen: %i\n",
-                 (fps / t_count),
-                 (wfps / avgw) / t_count,
-                 t_count,
-                 datestr,
-                 evas_version->major, evas_version->minor, evas_version->micro,
-                 evas_version->revision,
-                 profile,
-                 win_w, win_h,
-                 loops,
-                 choosen_engine,
-                 fullscreen);
+             else
+               printf("\n#####Test Result#####\n"
+                      "evas fps speed: %5.2f\n"
+                      "evas fps speed(weighted): %5.2f\n"
+                      "testcase count: %i\n"
+                      "date: %s\n"
+                      "evas version: %i.%i.%i.%i\n"
+                      "profile: %s\n"
+                      "window size: %i, %i\n"
+                      "loop count: %i\n"
+                      "engine: %s\n"
+                      "full screen: %i\n",
+                      (fps / t_count),
+                      (wfps / avgw) / t_count,
+                      t_count,
+                      datestr,
+                      evas_version->major, evas_version->minor, evas_version->micro,
+                      evas_version->revision,
+                      profile,
+                      win_w, win_h,
+                      loops,
+                      choosen_engine,
+                      fullscreen);

             ecore_main_loop_quit();
          }
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@ -46,17 +46,17 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
                   evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                   evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                   evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 13]),
+                 evas_obj_text_text_set(icons[i % 13]),
                 evas_obj_text_style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW),
                 evas_obj_color_set(255, 255, 255, 255),
                 evas_obj_text_shadow_color_set(0, 0, 0, 24),
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@ -46,17 +46,17 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
                 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 13]),
+                 evas_obj_text_text_set(icons[i % 13]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@ -46,17 +46,17 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
                 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-              evas_obj_text_set(icons[i % 13]),
+              evas_obj_text_text_set(icons[i % 13]),
              evas_obj_color_set(0, 0, 0, 255),
              evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@ -31,17 +31,17 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL),
                 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 1]),
+                 evas_obj_text_text_set(icons[i % 1]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@ -31,17 +31,17 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL),
                 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 1]),
+                 evas_obj_text_text_set(icons[i % 1]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@ -46,17 +46,17 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
                 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 13]),
+                 evas_obj_text_text_set(icons[i % 13]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@ -46,17 +46,17 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
                 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 13]),
+                 evas_obj_text_text_set(icons[i % 13]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@ -62,7 +62,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_filled_set(1),
                 evas_obj_image_border_set(2, 2, 2, 2),
@ -70,10 +70,10 @@ static void _setup(void)
                 evas_obj_size_set(win_w, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+                 evas_obj_text_text_set(labels[i % 26]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@ -62,7 +62,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_filled_set(1),
                 evas_obj_image_border_set(2, 2, 2, 2),
@ -70,10 +70,10 @@ static void _setup(void)
                 evas_obj_size_set(win_w, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+                 evas_obj_text_text_set(labels[i % 26]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@ -62,7 +62,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_filled_set(1),
                 evas_obj_image_border_set(2, 2, 2, 2),
@ -70,10 +70,10 @@ static void _setup(void)
                 evas_obj_size_set(win_w, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+                 evas_obj_text_text_set(labels[i % 26]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@ -62,7 +62,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_filled_set(1),
                 evas_obj_image_border_set(2, 2, 2, 2),
@ -70,10 +70,10 @@ static void _setup(void)
                 evas_obj_size_set(win_w, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+                 evas_obj_text_text_set(labels[i % 26]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@ -83,7 +83,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_filled_set(1),
                 evas_obj_image_border_set(2, 2, 2, 2),
@ -91,7 +91,7 @@ static void _setup(void)
                 evas_obj_size_set(win_w, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_icons[i] = o;
        eo_do(o, evas_obj_image_filled_set(1),
                 evas_obj_image_border_set(2, 2, 2, 2),
@ -99,10 +99,10 @@ static void _setup(void)
                 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+                 evas_obj_text_text_set(labels[i % 26]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@ -83,7 +83,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_filled_set(1),
                 evas_obj_image_border_set(2, 2, 2, 2),
@ -91,7 +91,7 @@ static void _setup(void)
                 evas_obj_size_set(win_w, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_icons[i] = o;
        eo_do(o, evas_obj_image_filled_set(1),
                 evas_obj_image_border_set(2, 2, 2, 2),
@ -99,10 +99,10 @@ static void _setup(void)
                 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+                 evas_obj_text_text_set(labels[i % 26]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@ -83,7 +83,7 @@ static void _setup(void)
   Evas_Object *o;
   for (i = 0; i < NUM; i++)
     {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_images[i] = o;
        eo_do(o, evas_obj_image_filled_set(1),
                 evas_obj_image_border_set(2, 2, 2, 2),
@ -91,7 +91,7 @@ static void _setup(void)
                 evas_obj_size_set(win_w, ICON_SIZE),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
        o_icons[i] = o;
        eo_do(o, evas_obj_image_filled_set(1),
                 evas_obj_image_border_set(2, 2, 2, 2),
@ -99,10 +99,10 @@ static void _setup(void)
                 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                 evas_obj_visibility_set(EINA_TRUE));

-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
        o_texts[i] = o;
        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+                 evas_obj_text_text_set(labels[i % 26]),
                 evas_obj_color_set(0, 0, 0, 255),
                 evas_obj_visibility_set(EINA_TRUE));
     }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jean-Philippe Andre	c2900ca520	UI main loop: Fix indentation	2014-10-22 16:08:13 +09:00
Jean-Philippe Andre	d4c8022788	Fix support of --count from command line expedite would never exit after N loops	2014-10-22 15:58:20 +09:00
Cedric BAIL	f046934f31	fix wrong ordering of report.	2014-09-04 14:23:38 +02:00
Cedric BAIL	ef0024c010	disable font until 1.11.	2014-09-04 13:55:21 +02:00
Cedric BAIL	c892d9a9e1	fix build on 1.10.x branch.	2014-09-04 13:50:44 +02:00