Switch back to eo_del.

This was a brutal eo_unref -> eo_del. Should be good enough.

113 files changed, 145 insertions, 145 deletions

diff --git a/src/bin/about.c b/src/bin/about.c
index cb6b4a8..46e18fa 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -49,7 +49,7 @@ _setup(void)
 static void
 _cleanup(void)
 {
-   eo_unref(o_text);
+   eo_del(o_text);
    o_text = NULL;
 }
 
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index d2d547e..2c18889 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 44094ca..853f165 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index 29b46d3..ac1f71b 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index 37635e6..f501049 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -40,7 +40,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index fa20edf..7ed0300 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < MANYNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < MANYNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 03bb837..5d87368 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 4862e94..80a2a64 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index 691c056..bd207e4 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index c9e6b78..97bed05 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index 0a2359b..c83901d 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -50,7 +50,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index 60c9824..db448b5 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index c2e88b5..79c2ba7 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index b37ef54..3918fcf 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 0830d5e..c25620b 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -50,7 +50,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 6a6b7b8..1f6ff17 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index a6dd031..f5ca31d 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index eed135f..7f515fa 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index f1b2bc1..c36b694 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -50,7 +50,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 6bc7456..c0078d9 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index ac58972..badd9a5 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index a3d96b3..5689be1 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index e1ca524..9318df1 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index 7c62f58..f777ff2 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 76eeb97..b34e8d3 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index 5f9c142..e99a94a 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index c30db86..36bc01b 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index aaaf0b6..b119da9 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index 4596d7b..db108d1 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 27e3120..ad33287 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index 8c5cf49..cb74a54 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 6dca757..cf8cd92 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index e80ecf0..6eb4dfe 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 8da4f5c..dbbb28b 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 2; i++) eo_unref(o_images[i]);
+   for (i = 0; i < 2; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index b4aad27..9ebf5e0 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -44,7 +44,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_unref(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 598f58f..8b88394 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -44,7 +44,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_unref(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index 7e41657..526d4c2 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -77,7 +77,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_unref(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    // FIXME: the object is not destroyed anymore so we can't free the data
    /* free(yp); */
    /* free(up); */
diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
index bb8dc0f..93417da 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -75,7 +75,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_unref(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 4797123..cb0ad52 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -74,7 +74,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_unref(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index 8caa07a..963e30b 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -75,7 +75,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_unref(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 35a9470..abc2732 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -171,7 +171,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index caacce5..f83a546 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -169,7 +169,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index c25a891..fd842c3 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -163,7 +163,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index d9b468d..b06e700 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -161,7 +161,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 9c64370..2adc07f 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -171,7 +171,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index ea9d9b1..7394971 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -168,7 +168,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_unref(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index de7c3d2..b1aca66 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -56,8 +56,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < CNUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_reflec[i]);
+        eo_del(o_images[i]);
+        eo_del(o_reflec[i]);
      }
 }
 
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index 813ab6e..5af331b 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index 75ee3ff..f60137f 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index fffe078..f4c85ab 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 7740047..5887202 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index 7693119..5a888f3 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index cf1a1ca..1408e50 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 056f68b..0ce0f44 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 8c21671..592b2c6 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index 871e4cf..662d490 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index da39642..a23b309 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index c21be3a..c192ea8 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index 9cf2780..f673cfc 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c
index 094256b..2c041d5 100644
--- a/src/bin/image_mask.c
+++ b/src/bin/image_mask.c
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index bae3841..4421d8a 100644
--- a/src/bin/image_mask_10.c
+++ b/src/bin/image_mask_10.c
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_unref(o_images[i]);
-   eo_unref(o_mask);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index 2565889..7449ec7 100644
--- a/src/bin/image_mask_11.c
+++ b/src/bin/image_mask_11.c
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
-   eo_unref(o_mask);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c
index 624406d..307ef49 100644
--- a/src/bin/image_mask_12.c
+++ b/src/bin/image_mask_12.c
@@ -49,8 +49,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
-   eo_unref(o_mask);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c
index f1429d3..0d4fa2c 100644
--- a/src/bin/image_mask_13.c
+++ b/src/bin/image_mask_13.c
@@ -49,8 +49,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
-   eo_unref(o_mask);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c
index aa4256a..bf74171 100644
--- a/src/bin/image_mask_2.c
+++ b/src/bin/image_mask_2.c
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c
index 23c0037..75f9d80 100644
--- a/src/bin/image_mask_3.c
+++ b/src/bin/image_mask_3.c
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c
index 4c35fc5..deea90b 100644
--- a/src/bin/image_mask_4.c
+++ b/src/bin/image_mask_4.c
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
-   eo_unref(o_mask);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c
index 72eab48..f4b0734 100644
--- a/src/bin/image_mask_5.c
+++ b/src/bin/image_mask_5.c
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
-   eo_unref(o_mask);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c
index 5d60705..cf5292d 100644
--- a/src/bin/image_mask_6.c
+++ b/src/bin/image_mask_6.c
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
-   eo_unref(o_mask);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c
index 95949f4..b1701a9 100644
--- a/src/bin/image_mask_7.c
+++ b/src/bin/image_mask_7.c
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
-   eo_unref(o_mask);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c
index 2b15e29..d2dbc57 100644
--- a/src/bin/image_mask_8.c
+++ b/src/bin/image_mask_8.c
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_unref(o_images[i]);
-   eo_unref(o_mask);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index 72c9835..499e6ce 100644
--- a/src/bin/image_mask_9.c
+++ b/src/bin/image_mask_9.c
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_unref(o_images[i]);
-   eo_unref(o_mask);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index fd728c1..1f7e9fe 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_unref(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c
index 5dde7ff..1492ca9 100644
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 #define PI (double) 3.141592654
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index fc89018..269dacf 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -85,7 +85,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index cc18a26..95cd4cf 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index ad49564..b4522e6 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -49,7 +49,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index aa9e517..9d77179 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -62,7 +62,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 49e106a..c7a5d66 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -71,7 +71,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index 37e083a..a199668 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index 9071cd5..0df2b35 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index fad51a3..411a521 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index 9094036..22f4452 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index ba7b6a3..1f08255 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 171fd49..7871ab1 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c
index 1a51a6f..ff9a755 100644
--- a/src/bin/snapshot_widgets_file_icons.c
+++ b/src/bin/snapshot_widgets_file_icons.c
@@ -102,10 +102,10 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
-   eo_unref(o_snap);
+   eo_del(o_snap);
 }
 
 /* loop - do things */
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index 55e9caa..df6ca78 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index 0411931..c3cc4d0 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -57,7 +57,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 365ab0e..e313e9e 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -48,7 +48,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 1c124f0..88d7400 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -60,7 +60,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index e484722..62a593a 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -58,7 +58,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_unref(o_text);
+   eo_del(o_text);
 }
 
 /* loop - do things */
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index 52c6af2..35cf8fa 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -119,7 +119,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_unref(o_text);
+   eo_del(o_text);
 }
 
 /* loop - do things */
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index 18da6ca..a598e56 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -90,7 +90,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_unref(o_text);
+   eo_del(o_text);
 }
 
 /* loop - do things */
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index e15c5b2..4f11d54 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -102,7 +102,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_unref(o_text);
+   eo_del(o_text);
    o_text = NULL;
 }
 
diff --git a/src/bin/vg_basic_circle.c b/src/bin/vg_basic_circle.c
index e5e2fc8..73bb9dd 100644
--- a/src/bin/vg_basic_circle.c
+++ b/src/bin/vg_basic_circle.c
@@ -52,7 +52,7 @@ static void _cleanup(void)
 {
    unsigned int i;
 
-   for (i = 0; i < OBNUM; i++) eo_unref(o_shapes[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/vg_basic_gradient.c b/src/bin/vg_basic_gradient.c
index 35f6e3b..b4346cd 100644
--- a/src/bin/vg_basic_gradient.c
+++ b/src/bin/vg_basic_gradient.c
@@ -65,7 +65,7 @@ static void _cleanup(void)
 {
    unsigned int i;
 
-   for (i = 0; i < OBNUM; i++) eo_unref(o_shapes[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/vg_basic_rect.c b/src/bin/vg_basic_rect.c
index b6560da..be0b5d8 100644
--- a/src/bin/vg_basic_rect.c
+++ b/src/bin/vg_basic_rect.c
@@ -52,7 +52,7 @@ static void _cleanup(void)
 {
    unsigned int i;
 
-   for (i = 0; i < OBNUM; i++) eo_unref(o_shapes[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/vg_scaled.c b/src/bin/vg_scaled.c
index 021b38c..451022f 100644
--- a/src/bin/vg_scaled.c
+++ b/src/bin/vg_scaled.c
@@ -67,7 +67,7 @@ static void _cleanup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_unref(o_objects[i]);
+        eo_del(o_objects[i]);
         o_objects[i] = NULL;
      }
 }
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index 2c961dc..367d07e 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -71,8 +71,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index c409c31..bcfe230 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -69,8 +69,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index 920108f..75a929b 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -78,8 +78,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index 445db2e..83dfeac 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -54,8 +54,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index 040ec13..3bcc64d 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -58,8 +58,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index 24d1928..b98c38a 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -69,8 +69,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index a12e39c..0c6b923 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -69,8 +69,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 544a354..4a9155a 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -85,8 +85,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index 8b86719..937727b 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -93,8 +93,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index 3c69564..a942052 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -85,8 +85,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index 1521e77..ec65e20 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -93,8 +93,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index e6620a9..c5ce307 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -113,9 +113,9 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_icons[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_icons[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index 780ed0a..60582d1 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -130,9 +130,9 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_icons[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_icons[i]);
+        eo_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index 9f6cdcc..4d58c75 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -111,9 +111,9 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_unref(o_images[i]);
-   for (i = 0; i < NUM; i++) eo_unref(o_icons[i]);
-   for (i = 0; i < NUM; i++) eo_unref(o_texts[i]);
+   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++) eo_del(o_icons[i]);
+   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 0d60f6e..ac64c93 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -129,9 +129,9 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_unref(o_images[i]);
-        eo_unref(o_icons[i]);
-        eo_unref(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_icons[i]);
+        eo_del(o_texts[i]);
      }
 }