summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-04-03 16:25:28 +0100
committerTom Hacohen <tom@stosb.com>2014-04-10 03:49:49 +0100
commit4e603db9c4b0262e598552aac2771f54fe015e05 (patch)
treeadb38ab0a709eb187bed526e688355ea4e0ff4d0
parentc8fb7660470798f365d43fe219a857e912788b9c (diff)
downloadelementary-4e603db9c4b0262e598552aac2771f54fe015e05.tar.gz
inwin: Adjusted to Eo2.
-rw-r--r--src/lib/elm_inwin.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index e5efcd7eb..422f926e7 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -103,9 +103,9 @@ elm_win_inwin_add(Evas_Object *parent)
EOLIAN static void
_elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
{
- Evas_Object *parent;
+ Evas_Object *parent = NULL;
- eo_do(obj, eo_parent_get(&parent));
+ eo_do(obj, parent = eo_parent_get());
if (parent && !eo_isa(parent, ELM_OBJ_WIN_CLASS))
{
@@ -136,7 +136,7 @@ elm_win_inwin_content_set(Evas_Object *obj,
Evas_Object *content)
{
ELM_INWIN_CHECK(obj);
- eo_do(obj, elm_obj_container_content_set(NULL, content, NULL));
+ eo_do(obj, elm_obj_container_content_set(NULL, content));
}
EAPI Evas_Object *
@@ -144,7 +144,7 @@ elm_win_inwin_content_get(const Evas_Object *obj)
{
ELM_INWIN_CHECK(obj) NULL;
Evas_Object *ret = NULL;
- eo_do((Eo *)obj, elm_obj_container_content_get(NULL, &ret));
+ eo_do((Eo *)obj, ret = elm_obj_container_content_get(NULL));
return ret;
}
@@ -153,7 +153,7 @@ elm_win_inwin_content_unset(Evas_Object *obj)
{
ELM_INWIN_CHECK(obj) NULL;
Evas_Object *ret = NULL;
- eo_do(obj, elm_obj_container_content_unset(NULL, &ret));
+ eo_do(obj, ret = elm_obj_container_content_unset(NULL));
return ret;
}