Eo related: Change according to recent changes in eo_add().

For more info check out a7560dbc61953c3652780f232e38adbd2d711972 in
the EFL tree.

66 files changed, 10 insertions, 67 deletions

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 0974e4bfe..8f1973dde 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1179,7 +1179,6 @@ elm_ctxpopup_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
 
    /* access: parent could be any object such as elm_list which does
       not know elc_ctxpopup as its child object in the focus_next(); */
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 201345323..7a83cd177 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -1551,7 +1551,6 @@ elm_fileselector_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c
index 8ab6b4cfc..3891389e7 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -212,7 +212,6 @@ elm_fileselector_button_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index c78aa71a0..35b18e807 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -343,7 +343,6 @@ elm_fileselector_entry_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index be6bbe342..a8f7a13a2 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -347,7 +347,6 @@ elm_hoversel_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 14f050ce2..d394453d3 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1610,7 +1610,6 @@ elm_multibuttonentry_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index d5d3e8b9a..7a54e8470 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1532,7 +1532,6 @@ elm_naviframe_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index 04f0a49e8..1e0c46230 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -706,7 +706,6 @@ elm_player_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 76ac2c55b..8daa8be0b 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -1484,7 +1484,6 @@ elm_popup_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
    wd->highlight_root = EINA_TRUE;
diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index f5875917e..cb7c0585c 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -1235,7 +1235,6 @@ _elm_access_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index dac487a15..ec9d72c43 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -520,7 +520,6 @@ elm_actionslider_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index bc71bafb2..03d264580 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -129,7 +129,6 @@ elm_bg_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index 6be7a1ef7..94440542d 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -431,7 +431,6 @@ elm_box_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 861268530..dd3d299f9 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -222,7 +222,6 @@ elm_bubble_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 418b79157..e994f1680 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -327,7 +327,6 @@ elm_button_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 1bde95d89..70a8213a8 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -1179,7 +1179,6 @@ elm_calendar_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 9a6373651..ce8a43734 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -369,7 +369,6 @@ elm_check_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 95317d642..473b5e9c6 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -795,7 +795,6 @@ elm_clock_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index e57294d0a..e4b6fff3e 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1865,7 +1865,6 @@ elm_colorselector_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 0f9ae8a14..56da8bb71 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -965,7 +965,6 @@ elm_conformant_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 09bff6443..9c8d0c1a2 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -867,7 +867,6 @@ elm_datetime_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index c67a9b253..fc718ca4e 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -444,7 +444,6 @@ elm_dayselector_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 1021d8438..304ded604 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -1434,7 +1434,6 @@ elm_diskselector_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index ed5c7feae..af407b61b 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -3660,7 +3660,6 @@ elm_entry_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index 5c28a12b0..a001c3118 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -1858,7 +1858,6 @@ elm_flip_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index b7b826e46..fd90c4841 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -603,7 +603,6 @@ elm_flipselector_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index c71ff4da4..d32a7eb06 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -198,7 +198,6 @@ elm_frame_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 385c1b8b8..b2c33f690 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -3643,7 +3643,6 @@ elm_gengrid_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 482bb71d3..dd2eeb213 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -5424,7 +5424,6 @@ elm_genlist_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index 6d901fa2e..fe2ec6444 100644
--- a/src/lib/elm_gesture_layer.c
+++ b/src/lib/elm_gesture_layer.c
@@ -3813,7 +3813,6 @@ elm_gesture_layer_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index 4f346564e..d8056952f 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -263,7 +263,6 @@ elm_glview_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_grid.c b/src/lib/elm_grid.c
index ad3a78b85..6b41855e4 100644
--- a/src/lib/elm_grid.c
+++ b/src/lib/elm_grid.c
@@ -164,7 +164,6 @@ elm_grid_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index a9c9e9f2f..ecb2e2288 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -629,7 +629,6 @@ elm_hover_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index 7720dc63c..4af3b7a8e 100644
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -689,7 +689,6 @@ elm_icon_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 89ac6622f..c57e6efc6 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -728,7 +728,6 @@ elm_image_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index cf66fe0a1..a94aa0728 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -1075,7 +1075,6 @@ elm_index_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 7a43d4cee..c1793a70a 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -209,7 +209,6 @@ static Evas_Object *
 _elm_pan_add(Evas *evas)
 {
    Evas_Object *obj = eo_add(MY_PAN_CLASS, evas);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index 50311d482..cf6a21cec 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -100,7 +100,6 @@ elm_win_inwin_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index c206b4738..dc938f2f1 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -404,8 +404,6 @@ elm_label_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 4e4c46a0d..59e041046 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -1682,7 +1682,6 @@ elm_layout_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 63fdbbb7c..795375b4e 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2414,7 +2414,6 @@ elm_list_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index a2f127b65..2bd787e57 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -4196,7 +4196,6 @@ elm_map_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index cbd76ef16..367f99e79 100644
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -289,7 +289,6 @@ elm_mapbuf_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index e3b9da8c3..d103393d7 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -747,7 +747,6 @@ elm_menu_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 1ecb66ffd..60307a19c 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -479,7 +479,6 @@ elm_notify_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index e1c8c0c43..0784c49e2 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -1083,7 +1083,6 @@ elm_panel_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
    wd->highlight_root = EINA_TRUE;
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index dfb6e828c..5c0bc1ab3 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -322,7 +322,6 @@ elm_panes_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 2bf583846..c14c3579b 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -309,7 +309,6 @@ elm_photo_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 88b02f1f8..1fb3c10cc 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -1414,7 +1414,6 @@ elm_photocam_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index 1beabf1e6..a6680981e 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -139,7 +139,6 @@ elm_plug_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index 99b4400c3..12e430293 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -511,7 +511,6 @@ elm_prefs_add(Evas_Object *parent)
      }
 
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index 816341170..fd85bc61c 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -326,7 +326,6 @@ elm_progressbar_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 045ce2917..0a4741e33 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -320,7 +320,6 @@ elm_radio_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_route.c b/src/lib/elm_route.c
index 649e25cae..605eed84e 100644
--- a/src/lib/elm_route.c
+++ b/src/lib/elm_route.c
@@ -179,7 +179,6 @@ elm_route_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 64c6e0954..fc26e68d1 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -771,7 +771,6 @@ elm_scroller_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index ed0c8bb2d..c256ceb2f 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -679,7 +679,6 @@ elm_segment_control_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index 736a34687..fd95d8a25 100644
--- a/src/lib/elm_separator.c
+++ b/src/lib/elm_separator.c
@@ -65,7 +65,6 @@ elm_separator_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index e437bb155..63eb42909 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -916,7 +916,6 @@ elm_slider_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 890d2280b..ae4d00bdc 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -382,7 +382,6 @@ elm_slideshow_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index afba203a6..20b1c0cec 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -850,7 +850,6 @@ elm_spinner_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_table.c b/src/lib/elm_table.c
index e912c8af8..b39db12b8 100644
--- a/src/lib/elm_table.c
+++ b/src/lib/elm_table.c
@@ -218,7 +218,6 @@ elm_table_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index 7bee347b4..1b3749c53 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -588,7 +588,6 @@ elm_thumb_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index bb6bb6a80..82793e4c9 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2982,7 +2982,6 @@ elm_toolbar_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 20e1dc848..c4b25eea2 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -276,7 +276,6 @@ elm_video_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index 42506eabf..ad4aa3f6a 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -721,7 +721,6 @@ elm_web_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
-   eo_unref(obj);
    return obj;
 }
 
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index c77482f44..1e6b9985e 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2868,7 +2868,6 @@ elm_win_add(Evas_Object *parent,
             Elm_Win_Type type)
 {
    Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_win_constructor(name, type));
-   eo_unref(obj);
    return obj;
 }
 
@@ -3293,6 +3292,16 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t
      }
 
    eo_do(obj, eo_parent_set(ecore_evas_get(tmp_sd.ee)));
+
+   /* XXX: This hack is needed because we parent ourselves to an inside object.
+    * That should be fixed, and then this can be fixed.
+    * Only needed if there wasn't a parent, because if there was, we are just
+    * replacing it. */
+   if (!parent)
+     {
+        eo_unref(obj);
+     }
+
    eo_do_super(obj, MY_CLASS, eo_constructor());
    eo_do(obj,
          evas_obj_type_set(MY_CLASS_NAME_LEGACY),