From a1f55ce68a0e652af38bc4b4c59ed5f8bd5029e9 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Fri, 11 Mar 2016 12:31:40 +0000 Subject: Revert "combobox: fix borkage after eo_add change." This reverts commit da8287fa370bb579a4a592dd280ac5c8a6a25830. --- src/lib/elc_combobox.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c index 689954347..0c552b564 100644 --- a/src/lib/elc_combobox.c +++ b/src/lib/elc_combobox.c @@ -458,8 +458,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd) elm_table_pack(sd->tbl, sd->spacer, 0, 0, 1, 1); // This is the genlist object that will take over the genlist call - eo_add(&gl, ELM_GENLIST_CLASS, obj); - sd->genlist = gl; + sd->genlist = gl = eo_add(&gl, ELM_GENLIST_CLASS, obj); elm_genlist_filter_set(gl, NULL); elm_widget_mirrored_automatic_set(gl, EINA_FALSE); elm_widget_mirrored_set(gl, elm_widget_mirrored_get(obj)); @@ -473,8 +472,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd) elm_table_pack(sd->tbl, gl, 0, 0, 1, 1); // This is the entry object that will take over the entry call - eo_add(&entry, ELM_ENTRY_CLASS, obj); - sd->entry = entry; + sd->entry = entry = eo_add(&entry, ELM_ENTRY_CLASS, obj); elm_widget_mirrored_automatic_set(entry, EINA_FALSE); elm_widget_mirrored_set(entry, elm_widget_mirrored_get(obj)); elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF, -- cgit v1.2.1