text_style_different_string: increase a factor to update animation properly.

and remove s9 resolution in the default list.

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));
@@ -73,6 +73,6 @@ _key(char *key)
 void
 about_start(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }

src/bin/expedite-cmp

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys
 import os

src/bin/font_effect_blur_alpha.c

@@ -1,3 +1,7 @@
+#include <Evas.h>
+
+#if EVAS_VERSION_MAJOR >= 1 && EVAS_VERSION_MINOR >= 9
+
 #undef FNAME
 #undef NAME
 #undef ICON
@@ -90,11 +94,13 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif
 #undef FNAME
 #undef NAME
 #undef ICON
+
+#endif

src/bin/font_effect_blur_color.c

@@ -1,3 +1,7 @@
+#include <Evas.h>
+
+#if EVAS_VERSION_MAJOR >= 1 && EVAS_VERSION_MINOR >= 9
+
 #undef FNAME
 #undef NAME
 #undef ICON
@@ -92,11 +96,14 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif
 #undef FNAME
 #undef NAME
 #undef ICON
+
+#endif
+

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),
@@ -96,8 +96,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -97,8 +97,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -98,8 +98,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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,
@@ -95,8 +95,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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);
@@ -97,8 +97,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -96,8 +96,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -96,8 +96,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -96,8 +96,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -96,8 +96,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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))
           {
@@ -109,8 +109,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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))
           {
@@ -61,6 +61,7 @@ static void _cleanup(void)
 /* loop - do things */
 static void _loop(double t, int f)
 {
+   static int k = 0;
    int i;
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
@@ -70,12 +71,13 @@ static void _loop(double t, int f)
              w = 120;
              h = 160;
              x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2);
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
+   ++k;
    FPS_STD(NAME);
 }
 
@@ -112,8 +114,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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))
           {
@@ -112,8 +112,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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))
           {
@@ -112,8 +112,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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)
           {
@@ -109,8 +109,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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)
           {
@@ -61,6 +61,7 @@ static void _cleanup(void)
 /* loop - do things */
 static void _loop(double t, int f)
 {
+   static int k = 0;
    int i;
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
@@ -70,12 +71,13 @@ static void _loop(double t, int f)
              w = 120;
              h = 160;
              x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2);
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
+   k++;
    FPS_STD(NAME);
 }
 
@@ -112,8 +114,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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)
           {
@@ -112,8 +112,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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)
           {
@@ -112,8 +112,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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))
           {
@@ -109,8 +109,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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))
           {
@@ -61,21 +61,23 @@ static void _cleanup(void)
 /* loop - do things */
 static void _loop(double t, int f)
 {
+   static int k = 0;
    int i;
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i > (OBNUM / 2))
+        if (i < (OBNUM / 2))
           {
              w = 120;
              h = 160;
              x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2);
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
+   ++k;
    FPS_STD(NAME);
 }
 
@@ -112,8 +114,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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))
           {
@@ -112,8 +112,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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))
           {
@@ -112,8 +112,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -96,8 +96,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -96,8 +96,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -96,8 +96,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -96,8 +96,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -96,8 +96,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -98,8 +98,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -97,8 +97,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -97,8 +97,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -94,8 +94,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -92,8 +92,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -92,8 +92,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -92,8 +92,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
               evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h),
-              data = evas_obj_image_data_get(1),
-              st = evas_obj_image_stride_get());
+              evas_obj_image_data_get(1, &data),
+              evas_obj_image_stride_get(&st));
         st = st >> 2;
         p = data;
         for (y = 0; y < h; y++)

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),
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
               evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h),
-              data = evas_obj_image_data_get(1),
-              st = evas_obj_image_stride_get());
+              evas_obj_image_data_get(1, &data),
+              evas_obj_image_stride_get(&st));
         st = st >> 2;
         p = data;
         for (y = 0; y < h; y++)

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),

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),
@@ -140,8 +140,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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),

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),
@@ -170,8 +170,8 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
    _setup();
+   ui_func_set(_key, _loop);
 }
 # endif
 #endif

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,

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,

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;