efl: use new API efl_file_simple_load.

src/bin/image_blend_border.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("bar.png"), NULL);
+        efl_file_simple_load(o, build_path("bar.png"), NULL);
         efl_gfx_image_border_set(o, 6, 6, 6, 6);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

src/bin/image_blend_border_recolor.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("pan.png"), NULL);
+        efl_file_simple_load(o, build_path("pan.png"), NULL);
         efl_gfx_color_set(o, 64, 64, 64, 255);
         efl_gfx_image_border_set(o, 3, 3, 3, 3);
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_blend_fade_pow2_unscaled.c

@@ -27,7 +27,7 @@ static void _setup(void)
 
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));

src/bin/image_blend_fade_unscaled.c

@@ -27,7 +27,7 @@ static void _setup(void)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         a = rnd()&0xff;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_color_set(o, a, a, a, a);

src/bin/image_blend_many_smooth_same_scaled.c

@@ -30,7 +30,7 @@ static void _setup(void)
         n = rnd() % 100;
         w = 3 + ((n * (60 - 3)) / 100);
         h = 4 + ((n * (80 - 4)) / 100);
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_image_smooth_scale_set(o, 1);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h));
         efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h));

src/bin/image_blend_nearest_same_scaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_image_smooth_scale_set(o, 0);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

src/bin/image_blend_nearest_scaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_image_smooth_scale_set(o, 0);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

src/bin/image_blend_nearest_solid_same_scaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_image_smooth_scale_set(o, 0);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

src/bin/image_blend_nearest_solid_scaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_image_smooth_scale_set(o, 0);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

src/bin/image_blend_occlude1.c

@@ -28,7 +28,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             efl_file_set(o, build_path("logo.png"), NULL);
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -36,7 +36,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, build_path("image.png"), NULL);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_occlude1_few.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             efl_file_set(o, PACKAGE_DATA_DIR"/data/logo.png", NULL);
+             efl_file_simple_load(o, PACKAGE_DATA_DIR"/data/logo.png", NULL);
           }
         else
           {
@@ -39,7 +39,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
+             efl_file_simple_load(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_occlude1_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             efl_file_set(o, build_path("logo.png"), NULL);
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,7 +39,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, build_path("image.png"), NULL);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_occlude1_very_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             efl_file_set(o, build_path("logo.png"), NULL);
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,7 +39,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, build_path("image.png"), NULL);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_occlude2.c

@@ -28,7 +28,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             efl_file_set(o, build_path("logo.png"), NULL);
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -36,7 +36,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, build_path("image.png"), NULL);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_occlude2_few.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             efl_file_set(o, build_path("logo.png"), NULL);
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,7 +39,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, build_path("image.png"), NULL);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_occlude2_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             efl_file_set(o, build_path("logo.png"), NULL);
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,7 +39,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, build_path("image.png"), NULL);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_occlude2_very_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             efl_file_set(o, build_path("logo.png"), NULL);
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,7 +39,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, build_path("image.png"), NULL);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_occlude3.c

@@ -28,7 +28,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             efl_file_set(o, build_path("logo.png"), NULL);
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -36,7 +36,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, build_path("image.png"), NULL);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_occlude3_few.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             efl_file_set(o, build_path("logo.png"), NULL);
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,7 +39,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, build_path("image.png"), NULL);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_occlude3_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             efl_file_set(o, build_path("logo.png"), NULL);
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,7 +39,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, build_path("image.png"), NULL);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_occlude3_very_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             efl_file_set(o, build_path("logo.png"), NULL);
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,7 +39,7 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             efl_file_set(o, build_path("image.png"), NULL);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
              efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));

src/bin/image_blend_smooth_same_scaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_image_smooth_scale_set(o, 1);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

src/bin/image_blend_smooth_scaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_image_smooth_scale_set(o, 1);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

src/bin/image_blend_smooth_solid_same_scaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_image_smooth_scale_set(o, 1);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

src/bin/image_blend_smooth_solid_scaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_image_smooth_scale_set(o, 1);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

src/bin/image_blend_solid_border.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("frame.png"), NULL);
+        efl_file_simple_load(o, build_path("frame.png"), NULL);
         efl_gfx_image_border_set(o, 8, 8, 8, 8);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

src/bin/image_blend_solid_fade_pow2_unscaled.c

@@ -27,7 +27,7 @@ static void _setup(void)
 
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));

src/bin/image_blend_solid_fade_unscaled.c

@@ -27,7 +27,7 @@ static void _setup(void)
 
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         a = rnd()&0xff;

src/bin/image_blend_solid_middle_border.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("bar.png"), NULL);
+        efl_file_simple_load(o, build_path("bar.png"), NULL);
         efl_gfx_image_border_set(o, 6, 6, 6, 6);
         efl_gfx_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID);
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_blend_solid_middle_unscaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_image_border_set(o, 43, 48, 48, 83);

src/bin/image_blend_solid_unscaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_blend_unscaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_crossfade.c

@@ -24,14 +24,14 @@ static void _setup(void)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_images[0] = o;
-   efl_file_set(o, build_path("im1.png"), NULL);
+   efl_file_simple_load(o, build_path("im1.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
    efl_gfx_entity_visible_set(o, EINA_TRUE);
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_images[1] = o;
-   efl_file_set(o, build_path("im2.png"), NULL);
+   efl_file_simple_load(o, build_path("im2.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
    efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_map_3d_1.c

@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        efl_file_set(o, build_path(buf), NULL);
+        efl_file_simple_load(o, build_path(buf), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_map_3d_2.c

@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        efl_file_set(o, build_path(buf), NULL);
+        efl_file_simple_load(o, build_path(buf), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_map_3d_3.c

@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        efl_file_set(o, build_path(buf), NULL);
+        efl_file_simple_load(o, build_path(buf), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_map_3d_4.c

@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        efl_file_set(o, build_path(buf), NULL);
+        efl_file_simple_load(o, build_path(buf), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_map_3d_5.c

@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
-        efl_file_set(o, build_path(buf), NULL);
+        efl_file_simple_load(o, build_path(buf), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_map_3d_6.c

@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
-        efl_file_set(o, build_path(buf), NULL);
+        efl_file_simple_load(o, build_path(buf), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_map_3d_flow.c

@@ -32,7 +32,7 @@ static void _setup(void)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
-        efl_file_set(o, build_path(buf), NULL);
+        efl_file_simple_load(o, build_path(buf), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
         efl_gfx_image_smooth_scale_set(o, 0);
@@ -41,7 +41,7 @@ static void _setup(void)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_reflec[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
-        efl_file_set(o, build_path(buf), NULL);
+        efl_file_simple_load(o, build_path(buf), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_map_color_alpha_nearest_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_map_color_alpha_nearest_solid_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_map_color_alpha_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_map_color_alpha_solid_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_map_color_nearest_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_map_color_nearest_solid_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_map_color_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_map_color_solid_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_map_nearest_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_map_nearest_solid_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_map_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-	efl_file_set(o, build_path("logo.png"), NULL);
+	efl_file_simple_load(o, build_path("logo.png"), NULL);
 	efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
 	efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
 	efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_map_solid_rotate.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
 	o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_mask.c

@@ -25,14 +25,14 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
-        efl_file_set(o, build_path("e-logo.png"), NULL);
+        efl_file_simple_load(o, build_path("e-logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_mask_10.c

@@ -25,7 +25,7 @@ static void _setup(void)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
-   efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+   efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
    efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("texture.png"), NULL);
+        efl_file_simple_load(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, win_w * 4, win_h * 4));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4));
         evas_object_clip_set(o, o_mask);

src/bin/image_mask_11.c

@@ -25,7 +25,7 @@ static void _setup(void)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
-   efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+   efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
    efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         evas_object_clip_set(o, o_mask);

src/bin/image_mask_12.c

@@ -25,7 +25,7 @@ static void _setup(void)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
-   efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+   efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
    efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_image_smooth_scale_set(o, 1);

src/bin/image_mask_13.c

@@ -25,7 +25,7 @@ static void _setup(void)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
-   efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+   efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
    efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_image_smooth_scale_set(o, 0);

src/bin/image_mask_2.c

@@ -25,14 +25,14 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("image.png"), NULL);
+        efl_file_simple_load(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
-        efl_file_set(o, build_path("e-logo-2.png"), NULL);
+        efl_file_simple_load(o, build_path("e-logo-2.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_mask_3.c

@@ -25,14 +25,14 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("e-logo-2.png"), NULL);
+        efl_file_simple_load(o, build_path("e-logo-2.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/image_mask_4.c

@@ -25,7 +25,7 @@ static void _setup(void)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
-   efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+   efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
    efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         evas_object_clip_set(o, o_mask);

src/bin/image_mask_5.c

@@ -25,7 +25,7 @@ static void _setup(void)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
-   efl_file_set(o, build_path("e-logo-2.png"), NULL);
+   efl_file_simple_load(o, build_path("e-logo-2.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
    efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, (win_h - 160) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         evas_object_clip_set(o, o_mask);

src/bin/image_mask_6.c

@@ -25,7 +25,7 @@ static void _setup(void)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
-   efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+   efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
    efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120 / 2, 160 / 2));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120 / 2, 160 / 2));
         evas_object_clip_set(o, o_mask);

src/bin/image_mask_7.c

@@ -25,7 +25,7 @@ static void _setup(void)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
-   efl_file_set(o, build_path("e-logo-2.png"), NULL);
+   efl_file_simple_load(o, build_path("e-logo-2.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
    efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, (win_h - 160) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         evas_object_clip_set(o, o_mask);

src/bin/image_mask_8.c

@@ -25,7 +25,7 @@ static void _setup(void)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
-   efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+   efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
    efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("texture.png"), NULL);
+        efl_file_simple_load(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 500, 444));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4));
         evas_object_clip_set(o, o_mask);

src/bin/image_mask_9.c

@@ -25,7 +25,7 @@ static void _setup(void)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
-   efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+   efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
    efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path("texture.png"), NULL);
+        efl_file_simple_load(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, 500, 444));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4));
         evas_object_clip_set(o, o_mask);

src/bin/image_quality_scale.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
 	o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
-	efl_file_set(o, build_path("tp.png"), NULL);
+	efl_file_simple_load(o, build_path("tp.png"), NULL);
 	efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480));
 	efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480));
 	efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/proxy_image.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o,*src;
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
-   efl_file_set(o, build_path("logo.png"), NULL);
+   efl_file_simple_load(o, build_path("logo.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
    efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/proxy_image_offscreen.c

@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o,*src;
 
    o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
-   efl_file_set(o, build_path("logo.png"), NULL);
+   efl_file_simple_load(o, build_path("logo.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
    efl_gfx_entity_position_set(o, EINA_POSITION2D(-400, -300));

src/bin/snapshot_widgets_file_icons.c

@@ -56,7 +56,7 @@ static void _setup(void)
 
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path(icons[i % 13]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_position_set(o, EINA_POSITION2D(x + 8, y));

src/bin/ui.c

@@ -363,7 +363,7 @@ _ui_menu_item_full_add(Eina_Bool test,
 
    mi = malloc(sizeof(Menu_Item));
    mi->o_icon = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
-   efl_file_set(mi->o_icon, build_path(icon), NULL);
+   efl_file_simple_load(mi->o_icon, build_path(icon), NULL);
    efl_gfx_entity_size_set(mi->o_icon, EINA_SIZE2D(32, 32));
    efl_gfx_fill_set(mi->o_icon, EINA_RECT(0, 0, 32, 32));
    mi->test = test;
@@ -437,7 +437,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, ((win_h - 160) / 2)));
-   efl_file_set(o, build_path("e-logo.png"), NULL);
+   efl_file_simple_load(o, build_path("e-logo.png"), NULL);
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
    efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
    efl_gfx_stack_layer_set(o, -98);
@@ -454,14 +454,14 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_entity_position_set(o, EINA_POSITION2D(0, 0));
-   efl_file_set(o, build_path("icon_sel.png"), NULL);
+   efl_file_simple_load(o, build_path("icon_sel.png"), NULL);
    efl_gfx_entity_size_set(o, EINA_SIZE2D(48, 48));
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 48, 48));
    o_menu_icon_sel = o;
 
    o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_entity_position_set(o, EINA_POSITION2D(0, 0));
-   efl_file_set(o, build_path("text_sel.png"), NULL);
+   efl_file_simple_load(o, build_path("text_sel.png"), NULL);
    efl_gfx_entity_size_set(o, EINA_SIZE2D(96, 32));
    efl_gfx_fill_set(o, EINA_RECT(0, 0, 96, 32));
    efl_gfx_image_border_set(o, 7, 7, 7, 7);
@@ -625,7 +625,7 @@ ui_loop(void *data EINA_UNUSED)
 
                   o = o_menu_icon;
                   snprintf(buf, 4096, "%s%s", data_dir, mi->icon);
-                  efl_file_set(o, buf, NULL);
+                  efl_file_simple_load(o, buf, NULL);
                   efl_gfx_color_set(o, a / 2, a / 2, a / 2, a / 2);
                }
              i++;

src/bin/widgets_file_icons.c

@@ -48,7 +48,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path(icons[i % 13]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/widgets_file_icons_2.c

@@ -48,7 +48,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path(icons[i % 13]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/widgets_file_icons_2_grouped.c

@@ -48,7 +48,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path(icons[i % 13]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/widgets_file_icons_2_same.c

@@ -33,7 +33,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path(icons[i % 1]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 1]), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/widgets_file_icons_2_same_grouped.c

@@ -33,7 +33,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path(icons[i % 1]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 1]), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/widgets_file_icons_3.c

@@ -48,7 +48,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path(icons[i % 13]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/widgets_file_icons_4.c

@@ -48,7 +48,7 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        efl_file_set(o, build_path(icons[i % 13]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);

src/bin/widgets_list_1.c

@@ -65,7 +65,7 @@ static void _setup(void)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path("pan.png"), NULL);
+        efl_file_simple_load(o, build_path("pan.png"), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 

src/bin/widgets_list_1_grouped.c

@@ -65,7 +65,7 @@ static void _setup(void)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path("pan.png"), NULL);
+        efl_file_simple_load(o, build_path("pan.png"), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 

src/bin/widgets_list_2.c

@@ -65,7 +65,7 @@ static void _setup(void)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path("pan.png"), NULL);
+        efl_file_simple_load(o, build_path("pan.png"), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 

src/bin/widgets_list_2_grouped.c

@@ -65,7 +65,7 @@ static void _setup(void)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path("pan.png"), NULL);
+        efl_file_simple_load(o, build_path("pan.png"), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 

src/bin/widgets_list_3.c

@@ -86,14 +86,14 @@ static void _setup(void)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path("pan.png"), NULL);
+        efl_file_simple_load(o, build_path("pan.png"), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path(icons[i % 13]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 

src/bin/widgets_list_3_grouped.c

@@ -86,14 +86,14 @@ static void _setup(void)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path("pan.png"), NULL);
+        efl_file_simple_load(o, build_path("pan.png"), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path(icons[i % 13]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 

src/bin/widgets_list_4.c

@@ -86,14 +86,14 @@ static void _setup(void)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path("pan.png"), NULL);
+        efl_file_simple_load(o, build_path("pan.png"), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path(icons[i % 13]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 

src/bin/widgets_list_4_grouped.c

@@ -86,14 +86,14 @@ static void _setup(void)
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path("pan.png"), NULL);
+        efl_file_simple_load(o, build_path("pan.png"), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 
         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         efl_gfx_image_border_set(o, 2, 2, 2, 2);
-        efl_file_set(o, build_path(icons[i % 13]), NULL);
+        efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
         efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
         efl_gfx_entity_visible_set(o, EINA_TRUE);