summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-05-20 16:31:04 +0100
committerTom Hacohen <tom@stosb.com>2015-05-20 16:31:42 +0100
commit152d18c2decff1fcbed4390a125d6283a5f48a5d (patch)
treefc0081b9b93f0278b477289cdf7dd1c62a9c4cba
parent9e1698607be968201f868ea343e3563f5d1a83f5 (diff)
Fix usage of the now removed eo_error_set().
This API has been removed from Eo.
-rw-r--r--src/bin/test_application_server.c2
-rw-r--r--src/lib/elm_app_client.c18
-rw-r--r--src/lib/elm_app_client.eo1
-rw-r--r--src/lib/elm_app_client_view.c46
-rw-r--r--src/lib/elm_app_client_view.eo19
-rw-r--r--src/lib/elm_app_server.c17
-rw-r--r--src/lib/elm_app_server.eo1
-rw-r--r--src/lib/elm_app_server_view.c44
-rw-r--r--src/lib/elm_app_server_view.eo16
-rw-r--r--src/lib/elm_glview.c10
-rw-r--r--src/lib/elm_glview.eo1
-rw-r--r--src/lib/elm_inwin.c2
-rw-r--r--src/lib/elm_widget.c2
-rw-r--r--src/lib/elm_win.c16
14 files changed, 106 insertions, 89 deletions
diff --git a/src/bin/test_application_server.c b/src/bin/test_application_server.c
index 126a2853e..227755f19 100644
--- a/src/bin/test_application_server.c
+++ b/src/bin/test_application_server.c
@@ -101,7 +101,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
101 } 101 }
102 102
103 view = eo_add(ELM_APP_SERVER_VIEW_CLASS, app_server, 103 view = eo_add(ELM_APP_SERVER_VIEW_CLASS, app_server,
104 elm_app_server_view_constructor(NULL)); 104 elm_app_server_view_id_set(NULL));
105 105
106 eo_do(view, id = elm_app_server_view_id_get()); 106 eo_do(view, id = elm_app_server_view_id_get());
107 eo_do(app_server, pkg = elm_app_server_package_get()); 107 eo_do(app_server, pkg = elm_app_server_package_get());
diff --git a/src/lib/elm_app_client.c b/src/lib/elm_app_client.c
index c5bb56047..5c4bd31ca 100644
--- a/src/lib/elm_app_client.c
+++ b/src/lib/elm_app_client.c
@@ -38,7 +38,7 @@ _sub_path_process(Elm_App_Client *eo, Eldbus_Message_Iter *obj_iter, Elm_App_Cli
38 continue; 38 continue;
39 39
40 view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, 40 view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo,
41 elm_app_client_view_constructor(obj_path)); 41 elm_app_client_view_path_set(obj_path));
42 eina_hash_add(data->views, obj_path, view); 42 eina_hash_add(data->views, obj_path, view);
43 if (!loading_list) 43 if (!loading_list)
44 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_CREATED, view)); 44 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_CREATED, view));
@@ -160,7 +160,7 @@ _elm_app_client_constructor(Eo *eo, Elm_App_Client_Data *data, const char *pkg)
160 Eldbus_Object *obj; 160 Eldbus_Object *obj;
161 char *path; 161 char *path;
162 162
163 EINA_SAFETY_ON_NULL_GOTO(pkg, error); 163 EINA_SAFETY_ON_NULL_RETURN(pkg);
164 164
165 data->views = eina_hash_string_small_new(NULL); 165 data->views = eina_hash_string_small_new(NULL);
166 166
@@ -177,10 +177,6 @@ _elm_app_client_constructor(Eo *eo, Elm_App_Client_Data *data, const char *pkg)
177 eo, EINA_FALSE); 177 eo, EINA_FALSE);
178 178
179 free(path); 179 free(path);
180
181 return;
182error:
183 eo_error_set(eo);
184} 180}
185 181
186static void 182static void
@@ -220,7 +216,7 @@ _create_view_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
220 if (!view) 216 if (!view)
221 { 217 {
222 view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, 218 view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo,
223 elm_app_client_view_constructor(view_path)); 219 elm_app_client_view_path_set(view_path));
224 eina_hash_add(cdata->views, view_path, view); 220 eina_hash_add(cdata->views, view_path, view);
225 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_CREATED, 221 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_CREATED,
226 view)); 222 view));
@@ -305,6 +301,14 @@ _elm_app_client_view_open_cancel(Eo *eo EINA_UNUSED, Elm_App_Client_Data *_pd EI
305 eldbus_pending_cancel(pending); 301 eldbus_pending_cancel(pending);
306} 302}
307 303
304EOLIAN static Eo *
305_elm_app_client_eo_base_finalize(Eo *obj, Elm_App_Client_Data *data)
306{
307 EINA_SAFETY_ON_NULL_RETURN_VAL(data->views, NULL);
308
309 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
310}
311
308EOLIAN static void 312EOLIAN static void
309_elm_app_client_eo_base_destructor(Eo *eo, Elm_App_Client_Data *data) 313_elm_app_client_eo_base_destructor(Eo *eo, Elm_App_Client_Data *data)
310{ 314{
diff --git a/src/lib/elm_app_client.eo b/src/lib/elm_app_client.eo
index 32de834e9..76e15f44e 100644
--- a/src/lib/elm_app_client.eo
+++ b/src/lib/elm_app_client.eo
@@ -50,6 +50,7 @@ class Elm_App_Client (Eo.Base)
50 } 50 }
51 implements { 51 implements {
52 Eo.Base.destructor; 52 Eo.Base.destructor;
53 Eo.Base.finalize;
53 } 54 }
54 constructors { 55 constructors {
55 .constructor; 56 .constructor;
diff --git a/src/lib/elm_app_client_view.c b/src/lib/elm_app_client_view.c
index 2cc8c4f8b..3ad1399c1 100644
--- a/src/lib/elm_app_client_view.c
+++ b/src/lib/elm_app_client_view.c
@@ -13,6 +13,7 @@ typedef struct
13{ 13{
14 Eldbus_Proxy *view_proxy; 14 Eldbus_Proxy *view_proxy;
15 Elm_App_View_State state; 15 Elm_App_View_State state;
16 Eina_Stringshare *path;
16} Elm_App_Client_View_Data; 17} Elm_App_Client_View_Data;
17 18
18static const char *_string_prop_get(const Eina_Value *v) 19static const char *_string_prop_get(const Eina_Value *v)
@@ -126,26 +127,25 @@ elm_app_client_view_internal_state_set(Eo *eo, Elm_App_View_State state)
126 (void *)(uintptr_t)cdata->state)); 127 (void *)(uintptr_t)cdata->state));
127} 128}
128 129
129EOLIAN static void 130EOLIAN static Eo *
130_elm_app_client_view_constructor(Eo *eo, Elm_App_Client_View_Data *data, const char *path) 131_elm_app_client_view_eo_base_finalize(Eo *eo, Elm_App_Client_View_Data *data)
131{ 132{
132 Elm_App_Client *parent = NULL; 133 Elm_App_Client *parent = NULL;
133 const char *package = path; 134 const char *package = data->path;
134 Eldbus_Connection *conn; 135 Eldbus_Connection *conn;
135 Eldbus_Object *obj; 136 Eldbus_Object *obj;
136 137
137 EINA_SAFETY_ON_NULL_GOTO(path, error);
138 eo_do_super(eo, MY_CLASS, eo_constructor());
139
140 eo_do(eo, parent = eo_parent_get()); 138 eo_do(eo, parent = eo_parent_get());
141 EINA_SAFETY_ON_TRUE_GOTO((!parent) || 139 EINA_SAFETY_ON_TRUE_RETURN_VAL((!parent) ||
142 (!eo_isa(parent, ELM_APP_CLIENT_CLASS)), error); 140 (!eo_isa(parent, ELM_APP_CLIENT_CLASS)), NULL);
141
142 EINA_SAFETY_ON_NULL_RETURN_VAL(data->path, NULL);
143 143
144 eo_do(parent, package = elm_app_client_package_get()); 144 eo_do(parent, package = elm_app_client_package_get());
145 145
146 eldbus_init(); 146 eldbus_init();
147 conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION); 147 conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
148 obj = eldbus_object_get(conn, package, path); 148 obj = eldbus_object_get(conn, package, data->path);
149 data->view_proxy = eldbus_proxy_get(obj, 149 data->view_proxy = eldbus_proxy_get(obj,
150 "org.enlightenment.ApplicationView1"); 150 "org.enlightenment.ApplicationView1");
151 eldbus_proxy_properties_monitor(data->view_proxy, EINA_TRUE); 151 eldbus_proxy_properties_monitor(data->view_proxy, EINA_TRUE);
@@ -156,10 +156,7 @@ _elm_app_client_view_constructor(Eo *eo, Elm_App_Client_View_Data *data, const c
156 ELDBUS_PROXY_EVENT_PROPERTY_LOADED, 156 ELDBUS_PROXY_EVENT_PROPERTY_LOADED,
157 _props_loaded, eo); 157 _props_loaded, eo);
158 158
159 return; 159 return eo_do_super_ret(eo, MY_CLASS, eo, eo_finalize());
160
161error:
162 eo_error_set(eo);
163} 160}
164 161
165static void 162static void
@@ -272,6 +269,18 @@ _elm_app_client_view_window_get(Eo *eo EINA_UNUSED, Elm_App_Client_View_Data *da
272 return _int_prop_get(v); 269 return _int_prop_get(v);
273} 270}
274 271
272EOLIAN static void
273_elm_app_client_view_path_set(Eo *eo EINA_UNUSED, Elm_App_Client_View_Data *data, const char *path)
274{
275 if (eo_finalized_get())
276 {
277 ERR("Can't set id after object has been created.");
278 return;
279 }
280
281 data->path = eina_stringshare_add(path);
282}
283
275EOLIAN static const char* 284EOLIAN static const char*
276_elm_app_client_view_path_get(Eo *eo EINA_UNUSED, Elm_App_Client_View_Data *data) 285_elm_app_client_view_path_get(Eo *eo EINA_UNUSED, Elm_App_Client_View_Data *data)
277{ 286{
@@ -305,16 +314,9 @@ _elm_app_client_view_eo_base_destructor(Eo *eo, Elm_App_Client_View_Data *data)
305 eldbus_connection_unref(conn); 314 eldbus_connection_unref(conn);
306 eldbus_shutdown(); 315 eldbus_shutdown();
307 316
308 eo_do_super(eo, MY_CLASS, eo_destructor()); 317 eina_stringshare_del(data->path);
309}
310 318
311EOLIAN static Eo * 319 eo_do_super(eo, MY_CLASS, eo_destructor());
312_elm_app_client_view_eo_base_constructor(Eo *obj, Elm_App_Client_View_Data *_pd EINA_UNUSED)
313{
314 eo_error_set(obj);
315 ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME);
316
317 return NULL;
318} 320}
319 321
320#include "elm_app_client_view.eo.c" 322#include "elm_app_client_view.eo.c"
diff --git a/src/lib/elm_app_client_view.eo b/src/lib/elm_app_client_view.eo
index 783bb1c5b..df84dd5e4 100644
--- a/src/lib/elm_app_client_view.eo
+++ b/src/lib/elm_app_client_view.eo
@@ -38,12 +38,17 @@ class Elm_App_Client_View (Eo.Base)
38 pixels: const(ubyte)*; /*@ uchar array, with all bytes of icon */ 38 pixels: const(ubyte)*; /*@ uchar array, with all bytes of icon */
39 } 39 }
40 } 40 }
41 path_set {
42 params {
43 path: const(char) *;
44 }
45 }
41 @property path { 46 @property path {
42 get { 47 get {
43 /*@ Get DBus path of view */ 48 /*@ Get DBus path of view */
44 } 49 }
45 values { 50 values {
46 ret: const(char)*; /*@ DBus path of view */ 51 ret: Eina_Stringshare *; /*@ DBus path of view */
47 } 52 }
48 } 53 }
49 @property package { 54 @property package {
@@ -78,13 +83,6 @@ class Elm_App_Client_View (Eo.Base)
78 ret: const(char)*; /*@ title of view */ 83 ret: const(char)*; /*@ title of view */
79 } 84 }
80 } 85 }
81 constructor {
82 /*@ Class constructor of elm_app_client_view */
83 legacy: null;
84 params {
85 @in path: const(char)*; /*@ DBus path of view */
86 }
87 }
88 pause { 86 pause {
89 /*@ Pause view */ 87 /*@ Pause view */
90 params { 88 params {
@@ -108,11 +106,8 @@ class Elm_App_Client_View (Eo.Base)
108 } 106 }
109 } 107 }
110 implements { 108 implements {
111 Eo.Base.constructor;
112 Eo.Base.destructor; 109 Eo.Base.destructor;
113 } 110 Eo.Base.finalize;
114 constructors {
115 .constructor;
116 } 111 }
117 events { 112 events {
118 state,changed; /*@ State of view changed. */ 113 state,changed; /*@ State of view changed. */
diff --git a/src/lib/elm_app_server.c b/src/lib/elm_app_server.c
index e5dc559ce..361b8a356 100644
--- a/src/lib/elm_app_server.c
+++ b/src/lib/elm_app_server.c
@@ -202,8 +202,8 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
202 202
203 data->create_view_cb = create_view_cb; 203 data->create_view_cb = create_view_cb;
204 204
205 EINA_SAFETY_ON_NULL_GOTO(data->create_view_cb, error); 205 EINA_SAFETY_ON_NULL_RETURN(data->create_view_cb);
206 EINA_SAFETY_ON_TRUE_GOTO(!pkg, error); 206 EINA_SAFETY_ON_TRUE_RETURN(!pkg);
207 207
208 data->views = eina_hash_string_small_new(NULL); 208 data->views = eina_hash_string_small_new(NULL);
209 data->PID = getpid(); 209 data->PID = getpid();
@@ -256,7 +256,7 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
256 progress = elm_app_server_view_props_progress_get(view_eet_props); 256 progress = elm_app_server_view_props_progress_get(view_eet_props);
257 257
258 view = eo_add(ELM_APP_SERVER_VIEW_CLASS, obj, 258 view = eo_add(ELM_APP_SERVER_VIEW_CLASS, obj,
259 elm_app_server_view_constructor(view_id)); 259 elm_app_server_view_id_set(view_id));
260 if (!view) 260 if (!view)
261 continue; 261 continue;
262 262
@@ -277,9 +277,6 @@ free_views_eet:
277 app_server_views_eet_shutdown(); 277 app_server_views_eet_shutdown();
278 278
279 return; 279 return;
280
281error:
282 eo_error_set(obj);
283} 280}
284 281
285EOLIAN static void 282EOLIAN static void
@@ -417,6 +414,14 @@ _elm_app_server_view_add(Eo *obj EINA_UNUSED, Elm_App_Server_Data *data, Elm_App
417 _view_append(data, view); 414 _view_append(data, view);
418} 415}
419 416
417EOLIAN static Eo *
418_elm_app_server_eo_base_finalize(Eo *obj, Elm_App_Server_Data *data)
419{
420 EINA_SAFETY_ON_NULL_RETURN_VAL(data->pkg, NULL);
421
422 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
423}
424
420EOLIAN static void 425EOLIAN static void
421_elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data) 426_elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data)
422{ 427{
diff --git a/src/lib/elm_app_server.eo b/src/lib/elm_app_server.eo
index 225430e93..23d566cf1 100644
--- a/src/lib/elm_app_server.eo
+++ b/src/lib/elm_app_server.eo
@@ -88,6 +88,7 @@ class Elm_App_Server (Eo.Base)
88 } 88 }
89 implements { 89 implements {
90 Eo.Base.destructor; 90 Eo.Base.destructor;
91 Eo.Base.finalize;
91 } 92 }
92 constructors { 93 constructors {
93 .constructor; 94 .constructor;
diff --git a/src/lib/elm_app_server_view.c b/src/lib/elm_app_server_view.c
index 36694c477..df735e929 100644
--- a/src/lib/elm_app_server_view.c
+++ b/src/lib/elm_app_server_view.c
@@ -299,16 +299,18 @@ _elm_app_server_view_path_get(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data *dat
299} 299}
300 300
301EOLIAN static void 301EOLIAN static void
302_elm_app_server_view_constructor(Eo *obj, Elm_App_Server_View_Data *data, const char *id) 302_elm_app_server_view_id_set(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data *data, const char *id)
303{ 303{
304 Elm_App_Server *server = NULL; 304 Elm_App_Server *server = NULL;
305 const char *server_path = NULL;
306 char view_path[PATH_MAX];
307 305
308 eo_do_super(obj, MY_CLASS, eo_constructor()); 306 if (eo_finalized_get())
307 {
308 ERR("Can't set id after object has been created.");
309 return;
310 }
309 311
310 eo_do(obj, server = eo_parent_get()); 312 eo_do(obj, server = eo_parent_get());
311 EINA_SAFETY_ON_TRUE_GOTO(!server || !eo_isa(server, ELM_APP_SERVER_CLASS), error); 313 EINA_SAFETY_ON_TRUE_RETURN(!server || !eo_isa(server, ELM_APP_SERVER_CLASS));
312 314
313 if (!id) 315 if (!id)
314 { 316 {
@@ -334,8 +336,24 @@ _elm_app_server_view_constructor(Eo *obj, Elm_App_Server_View_Data *data, const
334 if (valid) 336 if (valid)
335 data->id = eina_stringshare_add(id); 337 data->id = eina_stringshare_add(id);
336 } 338 }
339}
340
341EOLIAN static Eo *
342_elm_app_server_view_eo_base_finalize(Eo *obj, Elm_App_Server_View_Data *data)
343{
344 const char *server_path = NULL;
345 char view_path[PATH_MAX];
346 Elm_App_Server *server = NULL;
337 347
338 EINA_SAFETY_ON_NULL_GOTO(data->id, error); 348 eo_do(obj, server = eo_parent_get());
349 EINA_SAFETY_ON_TRUE_RETURN_VAL(!server || !eo_isa(server, ELM_APP_SERVER_CLASS), NULL);
350
351
352 if (!data->id)
353 {
354 ERR("Failed");
355 return NULL;
356 }
339 357
340 eo_do(server, server_path = elm_app_server_path_get()); 358 eo_do(server, server_path = elm_app_server_path_get());
341 snprintf(view_path, sizeof(view_path), "%s/%s", server_path, data->id); 359 snprintf(view_path, sizeof(view_path), "%s/%s", server_path, data->id);
@@ -350,10 +368,7 @@ _elm_app_server_view_constructor(Eo *obj, Elm_App_Server_View_Data *data, const
350 data->title = eina_stringshare_add(""); 368 data->title = eina_stringshare_add("");
351 data->icon_name = eina_stringshare_add(""); 369 data->icon_name = eina_stringshare_add("");
352 370
353 return; 371 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
354
355error:
356 eo_error_set(obj);
357} 372}
358 373
359EOLIAN static void 374EOLIAN static void
@@ -370,13 +385,4 @@ _elm_app_server_view_eo_base_destructor(Eo *obj, Elm_App_Server_View_Data *data)
370 eo_do_super(obj, MY_CLASS, eo_destructor()); 385 eo_do_super(obj, MY_CLASS, eo_destructor());
371} 386}
372 387
373EOLIAN static Eo *
374_elm_app_server_view_eo_base_constructor(Eo *obj, Elm_App_Server_View_Data *_pd EINA_UNUSED)
375{
376 eo_error_set(obj);
377 ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME);
378
379 return NULL;
380}
381
382#include "elm_app_server_view.eo.c" 388#include "elm_app_server_view.eo.c"
diff --git a/src/lib/elm_app_server_view.eo b/src/lib/elm_app_server_view.eo
index 11c465fa6..9464296a6 100644
--- a/src/lib/elm_app_server_view.eo
+++ b/src/lib/elm_app_server_view.eo
@@ -47,10 +47,12 @@ class Elm_App_Server_View (Eo.Base)
47 } 47 }
48 } 48 }
49 @property id { 49 @property id {
50 set {
51 }
50 get { 52 get {
51 } 53 }
52 values { 54 values {
53 ret: Eina_Stringshare *; 55 ret: const(char) *;
54 } 56 }
55 } 57 }
56 @property state { 58 @property state {
@@ -81,13 +83,6 @@ class Elm_App_Server_View (Eo.Base)
81 pixels: const(ubyte)*; 83 pixels: const(ubyte)*;
82 } 84 }
83 } 85 }
84 constructor {
85 /*@ Class constructor of elm_app_server_view */
86 legacy: null;
87 params {
88 @in id: const(char)* @nullable; /*@ identifier of view */
89 }
90 }
91 pause { 86 pause {
92 } 87 }
93 resume { 88 resume {
@@ -98,11 +93,8 @@ class Elm_App_Server_View (Eo.Base)
98 } 93 }
99 } 94 }
100 implements { 95 implements {
101 Eo.Base.constructor;
102 Eo.Base.destructor; 96 Eo.Base.destructor;
103 } 97 Eo.Base.finalize;
104 constructors {
105 .constructor;
106 } 98 }
107 events { 99 events {
108 resumed; /*@ Called when view must be resumed */ 100 resumed; /*@ Called when view must be resumed */
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index 8799f0013..559d698d0 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -316,12 +316,18 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
316 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 316 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
317 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 317 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
318 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ANIMATION)); 318 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ANIMATION));
319}
319 320
321EOLIAN static Eo *
322_elm_glview_eo_base_finalize(Eo *obj, Elm_Glview_Data *sd)
323{
320 if (!sd->evasgl) 324 if (!sd->evasgl)
321 { 325 {
322 eo_error_set(obj); 326 ERR("Failed");
323 return; 327 return NULL;
324 } 328 }
329
330 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
325} 331}
326 332
327EOLIAN static Evas_GL_API* 333EOLIAN static Evas_GL_API*
diff --git a/src/lib/elm_glview.eo b/src/lib/elm_glview.eo
index 6ce08a191..866e82d6f 100644
--- a/src/lib/elm_glview.eo
+++ b/src/lib/elm_glview.eo
@@ -209,6 +209,7 @@ class Elm.Glview (Elm.Widget)
209 } 209 }
210 implements { 210 implements {
211 class.constructor; 211 class.constructor;
212 Eo.Base.finalize;
212 Evas.Object_Smart.add; 213 Evas.Object_Smart.add;
213 Evas.Object_Smart.del; 214 Evas.Object_Smart.del;
214 Evas.Object_Smart.resize; 215 Evas.Object_Smart.resize;
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index 760d988cc..69c0f0516 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -110,7 +110,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
110 110
111 if (parent && !eo_isa(parent, ELM_WIN_CLASS)) 111 if (parent && !eo_isa(parent, ELM_WIN_CLASS))
112 { 112 {
113 eo_error_set(obj); /* *has* to have a parent window */ 113 ERR("Failed");
114 return NULL; 114 return NULL;
115 } 115 }
116 116
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 3b1cda01f..1fe8a99f4 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -4249,7 +4249,7 @@ _elm_widget_item_eo_base_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
4249 4249
4250 if (!_elm_widget_is(widget)) 4250 if (!_elm_widget_is(widget))
4251 { 4251 {
4252 eo_error_set(eo_item); 4252 ERR("Failed");
4253 return NULL; 4253 return NULL;
4254 } 4254 }
4255 4255
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 1bd208d33..4a84e3851 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3160,7 +3160,7 @@ _cb_deled(void *_data,
3160 return EO_CALLBACK_CONTINUE; 3160 return EO_CALLBACK_CONTINUE;
3161} 3161}
3162 3162
3163static void 3163static Eo *
3164_elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type type) 3164_elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type type)
3165{ 3165{
3166 sd->obj = obj; // in ctor 3166 sd->obj = obj; // in ctor
@@ -3501,8 +3501,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3501 if (!tmp_sd.ee) 3501 if (!tmp_sd.ee)
3502 { 3502 {
3503 ERR("Cannot create window."); 3503 ERR("Cannot create window.");
3504 eo_error_set(obj); 3504 return NULL;
3505 return;
3506 } 3505 }
3507 3506
3508 eo_do(obj, eo_parent_set(ecore_evas_get(tmp_sd.ee))); 3507 eo_do(obj, eo_parent_set(ecore_evas_get(tmp_sd.ee)));
@@ -3660,7 +3659,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3660#endif 3659#endif
3661 3660
3662 /* do not append to list; all windows render as black rects */ 3661 /* do not append to list; all windows render as black rects */
3663 if (type == ELM_WIN_FAKE) return; 3662 if (type == ELM_WIN_FAKE) return obj;
3664 _elm_win_list = eina_list_append(_elm_win_list, obj); 3663 _elm_win_list = eina_list_append(_elm_win_list, obj);
3665 _elm_win_count++; 3664 _elm_win_count++;
3666 3665
@@ -3739,13 +3738,18 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3739 3738
3740 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, sd), 3739 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, sd),
3741 eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, sd)); 3740 eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, sd));
3741
3742 return obj;
3742} 3743}
3743 3744
3744EOLIAN static Eo * 3745EOLIAN static Eo *
3745_elm_win_eo_base_finalize(Eo *obj, Elm_Win_Data *_pd) 3746_elm_win_eo_base_finalize(Eo *obj, Elm_Win_Data *_pd)
3746{ 3747{
3747 _elm_win_finalize_internal(obj, _pd, _pd->name, _pd->type); 3748 obj = _elm_win_finalize_internal(obj, _pd, _pd->name, _pd->type);
3748 eo_do_super(obj, MY_CLASS, obj = eo_finalize()); 3749 if (obj)
3750 {
3751 eo_do_super(obj, MY_CLASS, obj = eo_finalize());
3752 }
3749 return obj; 3753 return obj;
3750} 3754}
3751 3755