summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2019-09-24 17:46:56 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2019-09-24 18:27:37 +0200
commit553ce69bade88ac675aa56fcb184240403a12bfc (patch)
treed37ce5d07e2bb04fc4cc8bd3e8c3940836d1df20
parent72698aa6f5849ee6d24a76ae886d7817ea4373ae (diff)
efl: remove remaining instances of .eo global variables
-rw-r--r--src/lib/ecore_con/Efl_Net.h155
-rw-r--r--src/lib/ecore_con/ecore_con.c8
-rw-r--r--src/lib/ecore_con/efl_net_http_types.eot102
-rw-r--r--src/lib/ecore_con/efl_net_types.eot2
-rw-r--r--src/lib/ecore_con/meson.build3
-rw-r--r--src/lib/efl/Efl.h38
-rw-r--r--src/lib/efl/interfaces/efl_gfx_types.eot22
-rw-r--r--src/lib/elementary/Efl_Ui.h3
-rw-r--r--src/lib/elementary/efl_ui.eot15
-rw-r--r--src/lib/elementary/elm_main.c6
-rw-r--r--src/lib/elementary/elm_widget.h3
-rw-r--r--src/lib/eolian/database_var.c1
12 files changed, 281 insertions, 77 deletions
diff --git a/src/lib/ecore_con/Efl_Net.h b/src/lib/ecore_con/Efl_Net.h
index be21471..7cab05e 100644
--- a/src/lib/ecore_con/Efl_Net.h
+++ b/src/lib/ecore_con/Efl_Net.h
@@ -81,6 +81,161 @@ EAPI int ecore_con_url_init(void);
81 */ 81 */
82EAPI int ecore_con_url_shutdown(void); 82EAPI int ecore_con_url_shutdown(void);
83 83
84#ifdef EFL_BETA_API_SUPPORT
85/** HTTP error: bad content encoding */
86extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_BAD_CONTENT_ENCODING;
87
88/** HTTP error: bad download resume */
89extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_BAD_DOWNLOAD_RESUME;
90
91/** HTTP error: bad function argument */
92extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_BAD_FUNCTION_ARGUMENT;
93
94/** HTTP error: chunk failed */
95extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_CHUNK_FAILED;
96
97/** HTTP error: conv failed */
98extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_CONV_FAILED;
99
100/** HTTP error: conv reqd */
101extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_CONV_REQD;
102
103/** HTTP error: failed init */
104extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_FAILED_INIT;
105
106/** HTTP error: could not read file */
107extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_FILE_COULDNT_READ_FILE;
108
109/** HTTP error: filesize exceeded */
110extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_FILESIZE_EXCEEDED;
111
112/** HTTP error: function not found */
113extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_FUNCTION_NOT_FOUND;
114
115/** HTTP error: got nothing */
116extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_GOT_NOTHING;
117
118/** HTTP error: http2 */
119extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP2;
120
121/** HTTP error: http2 stream */
122extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP2_STREAM;
123
124/** HTTP error: http post error */
125extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP_POST_ERROR;
126
127/** HTTP error: http returned error */
128extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP_RETURNED_ERROR;
129
130/** HTTP error: interface failed */
131extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_INTERFACE_FAILED;
132
133/** HTTP error: login denied */
134extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_LOGIN_DENIED;
135
136/** HTTP error: no connection available */
137extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_NO_CONNECTION_AVAILABLE;
138
139/** HTTP error: not built in */
140extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_NOT_BUILT_IN;
141
142/** HTTP error: operation timeout */
143extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_OPERATION_TIMEDOUT;
144
145/** HTTP error: partial file */
146extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_PARTIAL_FILE;
147
148/** HTTP error: peer failed verification */
149extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_PEER_FAILED_VERIFICATION;
150
151/** HTTP error: range error */
152extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_RANGE_ERROR;
153
154/** HTTP error: read error */
155extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_READ_ERROR;
156
157/** HTTP error: receive error */
158extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_RECV_ERROR;
159
160/** HTTP error: remote access denied */
161extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_ACCESS_DENIED;
162
163/** HTTP error: remote disk full */
164extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_DISK_FULL;
165
166/** HTTP error: remote file exists */
167extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_EXISTS;
168
169/** HTTP error: remote file not found */
170extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_NOT_FOUND;
171
172/** HTTP error: send error */
173extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SEND_ERROR;
174
175/** HTTP error: send fail rewind */
176extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SEND_FAIL_REWIND;
177
178/** HTTP error: SSL cacert */
179extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT;
180
181/** HTTP error: SSL cacert bad file */
182extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT_BADFILE;
183
184/** HTTP error: SSL certproblem */
185extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CERTPROBLEM;
186
187/** HTTP error: SSL cipher */
188extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CIPHER;
189
190/** HTTP error: SSL connect error */
191extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CONNECT_ERROR;
192
193/** HTTP error: SSL crl bad file */
194extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CRL_BADFILE;
195
196/** HTTP error: SSL engine init failed */
197extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_INITFAILED;
198
199/** HTTP error: SSL engine not found */
200extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_NOTFOUND;
201
202/** HTTP error: SSL engine set failed */
203extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_SETFAILED;
204
205/** HTTP error: SSL invalid cert status */
206extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_INVALIDCERTSTATUS;
207
208/** HTTP error: SSL issuer error */
209extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ISSUER_ERROR;
210
211/** HTTP error: SSL pinned pub key does not match */
212extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_PINNEDPUBKEYNOTMATCH;
213
214/** HTTP error: SSL shutdown failed */
215extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_SHUTDOWN_FAILED;
216
217/** HTTP error: too many redirects */
218extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_TOO_MANY_REDIRECTS;
219
220/** HTTP error: unknown option */
221extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_UNKNOWN_OPTION;
222
223/** HTTP error: unsupported protocol */
224extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_UNSUPPORTED_PROTOCOL;
225
226/** HTTP error: upload failed */
227extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_UPLOAD_FAILED;
228
229/** HTTP error: URL mal-formatted */
230extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_URL_MALFORMAT;
231
232/** HTTP error: usage of SSL failed */
233extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_USE_SSL_FAILED;
234
235/** HTTP error: write error */
236extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_WRITE_ERROR;
237#endif /* EFL_BETA_API_SUPPORT */
238
84#include "efl_net_types.eot.h" 239#include "efl_net_types.eot.h"
85 240
86#include "efl_net_ip_address.eo.h" 241#include "efl_net_ip_address.eo.h"
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 5cf7bc1..8a4e0fb 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -48,6 +48,8 @@
48#include "Ecore_Con.h" 48#include "Ecore_Con.h"
49#include "ecore_con_private.h" 49#include "ecore_con_private.h"
50 50
51#include "efl_net_types.eot.c"
52
51#ifndef MSG_NOSIGNAL 53#ifndef MSG_NOSIGNAL
52#define MSG_NOSIGNAL 0 /* noop */ 54#define MSG_NOSIGNAL 0 /* noop */
53#endif 55#endif
@@ -57,8 +59,6 @@ int sd_fd_index = 0;
57int sd_fd_max = 0; 59int sd_fd_max = 0;
58#endif 60#endif
59 61
60EWAPI Eina_Error EFL_NET_ERROR_COULDNT_RESOLVE_HOST = 0;
61
62static int _ecore_con_init_count = 0; 62static int _ecore_con_init_count = 0;
63int _ecore_con_log_dom = -1; 63int _ecore_con_log_dom = -1;
64 64
@@ -95,10 +95,10 @@ ecore_con_init(void)
95 ecore_con_mempool_init(); 95 ecore_con_mempool_init();
96 ecore_con_legacy_init(); 96 ecore_con_legacy_init();
97 97
98 EFL_NET_ERROR_COULDNT_RESOLVE_HOST = eina_error_msg_static_register("Couldn't resolve host name");
99
100 /* initialize the .eo file errors once to guarantee thread safety */ 98 /* initialize the .eo file errors once to guarantee thread safety */
101 99
100 EFL_NET_ERROR_COULDNT_RESOLVE_HOST;
101
102 EFL_NET_DIALER_ERROR_COULDNT_CONNECT; 102 EFL_NET_DIALER_ERROR_COULDNT_CONNECT;
103 EFL_NET_DIALER_ERROR_COULDNT_RESOLVE_PROXY; 103 EFL_NET_DIALER_ERROR_COULDNT_RESOLVE_PROXY;
104 EFL_NET_DIALER_ERROR_PROXY_AUTHENTICATION_FAILED; 104 EFL_NET_DIALER_ERROR_PROXY_AUTHENTICATION_FAILED;
diff --git a/src/lib/ecore_con/efl_net_http_types.eot b/src/lib/ecore_con/efl_net_http_types.eot
index 01a4cff..63784f8 100644
--- a/src/lib/ecore_con/efl_net_http_types.eot
+++ b/src/lib/ecore_con/efl_net_http_types.eot
@@ -126,54 +126,54 @@ struct @beta Efl.Net.Http.Header {
126 value: string; [[Header value]] 126 value: string; [[Header value]]
127} 127}
128 128
129var @beta Efl.Net.Http.Error.BAD_CONTENT_ENCODING: Eina.Error; [[HTTP error: bad content encoding]] 129error @extern @beta Efl.Net.Http.Error.BAD_CONTENT_ENCODING = "XXX"; [[HTTP error: bad content encoding]]
130var @beta Efl.Net.Http.Error.BAD_DOWNLOAD_RESUME: Eina.Error; [[HTTP error: bad download resume]] 130error @extern @beta Efl.Net.Http.Error.BAD_DOWNLOAD_RESUME = "XXX"; [[HTTP error: bad download resume]]
131var @beta Efl.Net.Http.Error.BAD_FUNCTION_ARGUMENT: Eina.Error; [[HTTP error: bad function argument]] 131error @extern @beta Efl.Net.Http.Error.BAD_FUNCTION_ARGUMENT = "XXX"; [[HTTP error: bad function argument]]
132var @beta Efl.Net.Http.Error.CHUNK_FAILED: Eina.Error; [[HTTP error: chunk failed]] 132error @extern @beta Efl.Net.Http.Error.CHUNK_FAILED = "XXX"; [[HTTP error: chunk failed]]
133var @beta Efl.Net.Http.Error.CONV_FAILED: Eina.Error; [[HTTP error: conv failed]] 133error @extern @beta Efl.Net.Http.Error.CONV_FAILED = "XXX"; [[HTTP error: conv failed]]
134var @beta Efl.Net.Http.Error.CONV_REQD: Eina.Error; [[HTTP error: conv reqd]] 134error @extern @beta Efl.Net.Http.Error.CONV_REQD = "XXX"; [[HTTP error: conv reqd]]
135var @beta Efl.Net.Http.Error.FAILED_INIT: Eina.Error; [[HTTP error: failed init]] 135error @extern @beta Efl.Net.Http.Error.FAILED_INIT = "XXX"; [[HTTP error: failed init]]
136var @beta Efl.Net.Http.Error.FILE_COULDNT_READ_FILE: Eina.Error; [[HTTP error: could not read file]] 136error @extern @beta Efl.Net.Http.Error.FILE_COULDNT_READ_FILE = "XXX"; [[HTTP error: could not read file]]
137var @beta Efl.Net.Http.Error.FILESIZE_EXCEEDED: Eina.Error; [[HTTP error: filesize exceeded]] 137error @extern @beta Efl.Net.Http.Error.FILESIZE_EXCEEDED = "XXX"; [[HTTP error: filesize exceeded]]
138var @beta Efl.Net.Http.Error.FUNCTION_NOT_FOUND: Eina.Error; [[HTTP error: function not found]] 138error @extern @beta Efl.Net.Http.Error.FUNCTION_NOT_FOUND = "XXX"; [[HTTP error: function not found]]
139var @beta Efl.Net.Http.Error.GOT_NOTHING: Eina.Error; [[HTTP error: got nothing]] 139error @extern @beta Efl.Net.Http.Error.GOT_NOTHING = "XXX"; [[HTTP error: got nothing]]
140var @beta Efl.Net.Http.Error.HTTP2: Eina.Error; [[HTTP error: http2]] 140error @extern @beta Efl.Net.Http.Error.HTTP2 = "XXX"; [[HTTP error: http2]]
141var @beta Efl.Net.Http.Error.HTTP2_STREAM: Eina.Error; [[HTTP error: http2 stream]] 141error @extern @beta Efl.Net.Http.Error.HTTP2_STREAM = "XXX"; [[HTTP error: http2 stream]]
142var @beta Efl.Net.Http.Error.HTTP_POST_ERROR: Eina.Error; [[HTTP error: http post error]] 142error @extern @beta Efl.Net.Http.Error.HTTP_POST_ERROR = "XXX"; [[HTTP error: http post error]]
143var @beta Efl.Net.Http.Error.HTTP_RETURNED_ERROR: Eina.Error; [[HTTP error: http returned error]] 143error @extern @beta Efl.Net.Http.Error.HTTP_RETURNED_ERROR = "XXX"; [[HTTP error: http returned error]]
144var @beta Efl.Net.Http.Error.INTERFACE_FAILED: Eina.Error; [[HTTP error: interface failed]] 144error @extern @beta Efl.Net.Http.Error.INTERFACE_FAILED = "XXX"; [[HTTP error: interface failed]]
145var @beta Efl.Net.Http.Error.LOGIN_DENIED: Eina.Error; [[HTTP error: login denied]] 145error @extern @beta Efl.Net.Http.Error.LOGIN_DENIED = "XXX"; [[HTTP error: login denied]]
146var @beta Efl.Net.Http.Error.NO_CONNECTION_AVAILABLE: Eina.Error; [[HTTP error: no connection available]] 146error @extern @beta Efl.Net.Http.Error.NO_CONNECTION_AVAILABLE = "XXX"; [[HTTP error: no connection available]]
147var @beta Efl.Net.Http.Error.NOT_BUILT_IN: Eina.Error; [[HTTP error: not built in]] 147error @extern @beta Efl.Net.Http.Error.NOT_BUILT_IN = "XXX"; [[HTTP error: not built in]]
148var @beta Efl.Net.Http.Error.OPERATION_TIMEDOUT: Eina.Error; [[HTTP error: operation timeout]] 148error @extern @beta Efl.Net.Http.Error.OPERATION_TIMEDOUT = "XXX"; [[HTTP error: operation timeout]]
149var @beta Efl.Net.Http.Error.PARTIAL_FILE: Eina.Error; [[HTTP error: partial file]] 149error @extern @beta Efl.Net.Http.Error.PARTIAL_FILE = "XXX"; [[HTTP error: partial file]]
150var @beta Efl.Net.Http.Error.PEER_FAILED_VERIFICATION: Eina.Error; [[HTTP error: peer failed verification]] 150error @extern @beta Efl.Net.Http.Error.PEER_FAILED_VERIFICATION = "XXX"; [[HTTP error: peer failed verification]]
151var @beta Efl.Net.Http.Error.RANGE_ERROR: Eina.Error; [[HTTP error: range error]] 151error @extern @beta Efl.Net.Http.Error.RANGE_ERROR = "XXX"; [[HTTP error: range error]]
152var @beta Efl.Net.Http.Error.READ_ERROR: Eina.Error; [[HTTP error: read error]] 152error @extern @beta Efl.Net.Http.Error.READ_ERROR = "XXX"; [[HTTP error: read error]]
153var @beta Efl.Net.Http.Error.RECV_ERROR: Eina.Error; [[HTTP error: receive error]] 153error @extern @beta Efl.Net.Http.Error.RECV_ERROR = "XXX"; [[HTTP error: receive error]]
154var @beta Efl.Net.Http.Error.REMOTE_ACCESS_DENIED: Eina.Error; [[HTTP error: remote access denied]] 154error @extern @beta Efl.Net.Http.Error.REMOTE_ACCESS_DENIED = "XXX"; [[HTTP error: remote access denied]]
155var @beta Efl.Net.Http.Error.REMOTE_DISK_FULL: Eina.Error; [[HTTP error: remote disk full]] 155error @extern @beta Efl.Net.Http.Error.REMOTE_DISK_FULL = "XXX"; [[HTTP error: remote disk full]]
156var @beta Efl.Net.Http.Error.REMOTE_FILE_EXISTS: Eina.Error; [[HTTP error: remote file exists]] 156error @extern @beta Efl.Net.Http.Error.REMOTE_FILE_EXISTS = "XXX"; [[HTTP error: remote file exists]]
157var @beta Efl.Net.Http.Error.REMOTE_FILE_NOT_FOUND: Eina.Error; [[HTTP error: remote file not found]] 157error @extern @beta Efl.Net.Http.Error.REMOTE_FILE_NOT_FOUND = "XXX"; [[HTTP error: remote file not found]]
158var @beta Efl.Net.Http.Error.SEND_ERROR: Eina.Error; [[HTTP error: send error]] 158error @extern @beta Efl.Net.Http.Error.SEND_ERROR = "XXX"; [[HTTP error: send error]]
159var @beta Efl.Net.Http.Error.SEND_FAIL_REWIND: Eina.Error; [[HTTP error: send fail rewind]] 159error @extern @beta Efl.Net.Http.Error.SEND_FAIL_REWIND = "XXX"; [[HTTP error: send fail rewind]]
160var @beta Efl.Net.Http.Error.SSL_CACERT: Eina.Error; [[HTTP error: SSL cacert]] 160error @extern @beta Efl.Net.Http.Error.SSL_CACERT = "XXX"; [[HTTP error: SSL cacert]]
161var @beta Efl.Net.Http.Error.SSL_CACERT_BADFILE: Eina.Error; [[HTTP error: SSL cacert bad file]] 161error @extern @beta Efl.Net.Http.Error.SSL_CACERT_BADFILE = "XXX"; [[HTTP error: SSL cacert bad file]]
162var @beta Efl.Net.Http.Error.SSL_CERTPROBLEM: Eina.Error; [[HTTP error: SSL certproblem]] 162error @extern @beta Efl.Net.Http.Error.SSL_CERTPROBLEM = "XXX"; [[HTTP error: SSL certproblem]]
163var @beta Efl.Net.Http.Error.SSL_CIPHER: Eina.Error; [[HTTP error: SSL cipher]] 163error @extern @beta Efl.Net.Http.Error.SSL_CIPHER = "XXX"; [[HTTP error: SSL cipher]]
164var @beta Efl.Net.Http.Error.SSL_CONNECT_ERROR: Eina.Error; [[HTTP error: SSL connect error]] 164error @extern @beta Efl.Net.Http.Error.SSL_CONNECT_ERROR = "XXX"; [[HTTP error: SSL connect error]]
165var @beta Efl.Net.Http.Error.SSL_CRL_BADFILE: Eina.Error; [[HTTP error: SSL crl bad file]] 165error @extern @beta Efl.Net.Http.Error.SSL_CRL_BADFILE = "XXX"; [[HTTP error: SSL crl bad file]]
166var @beta Efl.Net.Http.Error.SSL_ENGINE_INITFAILED: Eina.Error; [[HTTP error: SSL engine init failed]] 166error @extern @beta Efl.Net.Http.Error.SSL_ENGINE_INITFAILED = "XXX"; [[HTTP error: SSL engine init failed]]
167var @beta Efl.Net.Http.Error.SSL_ENGINE_NOTFOUND: Eina.Error; [[HTTP error: SSL engine not found]] 167error @extern @beta Efl.Net.Http.Error.SSL_ENGINE_NOTFOUND = "XXX"; [[HTTP error: SSL engine not found]]
168var @beta Efl.Net.Http.Error.SSL_ENGINE_SETFAILED: Eina.Error; [[HTTP error: SSL engine set failed]] 168error @extern @beta Efl.Net.Http.Error.SSL_ENGINE_SETFAILED = "XXX"; [[HTTP error: SSL engine set failed]]
169var @beta Efl.Net.Http.Error.SSL_INVALIDCERTSTATUS: Eina.Error; [[HTTP error: SSL invalid cert status]] 169error @extern @beta Efl.Net.Http.Error.SSL_INVALIDCERTSTATUS = "XXX"; [[HTTP error: SSL invalid cert status]]
170var @beta Efl.Net.Http.Error.SSL_ISSUER_ERROR: Eina.Error; [[HTTP error: SSL issuer error]] 170error @extern @beta Efl.Net.Http.Error.SSL_ISSUER_ERROR = "XXX"; [[HTTP error: SSL issuer error]]
171var @beta Efl.Net.Http.Error.SSL_PINNEDPUBKEYNOTMATCH: Eina.Error; [[HTTP error: SSL pinned pub key does not match]] 171error @extern @beta Efl.Net.Http.Error.SSL_PINNEDPUBKEYNOTMATCH = "XXX"; [[HTTP error: SSL pinned pub key does not match]]
172var @beta Efl.Net.Http.Error.SSL_SHUTDOWN_FAILED: Eina.Error; [[HTTP error: SSL shutdown failed]] 172error @extern @beta Efl.Net.Http.Error.SSL_SHUTDOWN_FAILED = "XXX"; [[HTTP error: SSL shutdown failed]]
173var @beta Efl.Net.Http.Error.TOO_MANY_REDIRECTS: Eina.Error; [[HTTP error: too many redirects]] 173error @extern @beta Efl.Net.Http.Error.TOO_MANY_REDIRECTS = "XXX"; [[HTTP error: too many redirects]]
174var @beta Efl.Net.Http.Error.UNKNOWN_OPTION: Eina.Error; [[HTTP error: unknown option]] 174error @extern @beta Efl.Net.Http.Error.UNKNOWN_OPTION = "XXX"; [[HTTP error: unknown option]]
175var @beta Efl.Net.Http.Error.UNSUPPORTED_PROTOCOL: Eina.Error; [[HTTP error: unsupported protocol]] 175error @extern @beta Efl.Net.Http.Error.UNSUPPORTED_PROTOCOL = "XXX"; [[HTTP error: unsupported protocol]]
176var @beta Efl.Net.Http.Error.UPLOAD_FAILED: Eina.Error; [[HTTP error: upload failed]] 176error @extern @beta Efl.Net.Http.Error.UPLOAD_FAILED = "XXX"; [[HTTP error: upload failed]]
177var @beta Efl.Net.Http.Error.URL_MALFORMAT: Eina.Error; [[HTTP error: URL mal-formatted]] 177error @extern @beta Efl.Net.Http.Error.URL_MALFORMAT = "XXX"; [[HTTP error: URL mal-formatted]]
178var @beta Efl.Net.Http.Error.USE_SSL_FAILED: Eina.Error; [[HTTP error: usage of SSL failed]] 178error @extern @beta Efl.Net.Http.Error.USE_SSL_FAILED = "XXX"; [[HTTP error: usage of SSL failed]]
179var @beta Efl.Net.Http.Error.WRITE_ERROR: Eina.Error; [[HTTP error: write error]] 179error @extern @beta Efl.Net.Http.Error.WRITE_ERROR = "XXX"; [[HTTP error: write error]]
diff --git a/src/lib/ecore_con/efl_net_types.eot b/src/lib/ecore_con/efl_net_types.eot
index 48512fb..36d8bba 100644
--- a/src/lib/ecore_con/efl_net_types.eot
+++ b/src/lib/ecore_con/efl_net_types.eot
@@ -1,3 +1,3 @@
1import eina_types; 1import eina_types;
2 2
3var @beta Efl.Net.Error.COULDNT_RESOLVE_HOST: Eina.Error; [[Could not resolve the given host name]] 3error @beta Efl.Net.Error.COULDNT_RESOLVE_HOST = "Couldn't resolve host name"; [[Could not resolve the given host name]]
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index eacf16f..fc53d32 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -89,8 +89,9 @@ foreach eo_file : pub_eo_types_files
89 install_dir : dir_package_include, 89 install_dir : dir_package_include,
90 command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, 90 command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
91 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 91 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
92 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
92 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), 93 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
93 '-ghd', '@INPUT@']) 94 '-gchd', '@INPUT@'])
94endforeach 95endforeach
95 96
96eolian_include_directories += ['-I', meson.current_source_dir()] 97eolian_include_directories += ['-I', meson.current_source_dir()]
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index db6e21b..9f3b2ff 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -76,6 +76,44 @@ typedef struct _Efl_Text_Annotate_Annotation Efl_Text_Annotate_Annotation;
76#include <Efl_MVVM_Common.h> 76#include <Efl_MVVM_Common.h>
77 77
78/* Data types */ 78/* Data types */
79
80#ifdef EFL_BETA_API_SUPPORT
81/** No error on load */
82extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_NONE;
83
84/** A non-specific error occurred */
85extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_GENERIC;
86
87/** File (or file path) does not exist */
88extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_DOES_NOT_EXIST;
89
90/** Permission denied to an existing file (or path) */
91extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_PERMISSION_DENIED;
92
93/** Allocation of resources failure prevented load */
94extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
95
96/** File corrupt (but was detected as a known format) */
97extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CORRUPT_FILE;
98
99/** File is not a known format */
100extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT;
101
102/** Reading operation has been cancelled during decoding */
103extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CANCELLED;
104
105/** (Edje only) The file pointed to is incompatible, i.e., it doesn't
106 * match the library's current version's format. */
107extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_INCOMPATIBLE_FILE;
108
109/** (Edje only) The group/collection set to load from was not found in the file */
110extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_COLLECTION;
111
112/** (Edje only) The group/collection set to load from had recursive references
113 * on its components */
114extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RECURSIVE_REFERENCE;
115#endif /* EFL_BETA_API_SUPPORT */
116
79#include "interfaces/efl_gfx_types.eot.h" 117#include "interfaces/efl_gfx_types.eot.h"
80#include "interfaces/efl_ui_types.eot.h" 118#include "interfaces/efl_ui_types.eot.h"
81typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command; 119typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot b/src/lib/efl/interfaces/efl_gfx_types.eot
index e0ec30a..2e14ae9 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -205,14 +205,14 @@ enum @beta Efl.Gfx.Color_Class_Layer {
205 205
206type @beta Efl.Font.Size: int; [[Efl font size type]] 206type @beta Efl.Font.Size: int; [[Efl font size type]]
207 207
208var @beta Efl.Gfx.Image.Load_Error.NONE: Eina.Error; [[No error on load]] 208error @extern @beta Efl.Gfx.Image.Load_Error.NONE = "XXX"; [[No error on load]]
209var @beta Efl.Gfx.Image.Load_Error.GENERIC: Eina.Error; [[A non-specific error occurred]] 209error @extern @beta Efl.Gfx.Image.Load_Error.GENERIC = "XXX"; [[A non-specific error occurred]]
210var @beta Efl.Gfx.Image.Load_Error.DOES_NOT_EXIST: Eina.Error; [[File (or file path) does not exist]] 210error @extern @beta Efl.Gfx.Image.Load_Error.DOES_NOT_EXIST = "XXX"; [[File (or file path) does not exist]]
211var @beta Efl.Gfx.Image.Load_Error.PERMISSION_DENIED: Eina.Error; [[Permission denied to an existing file (or path)]] 211error @extern @beta Efl.Gfx.Image.Load_Error.PERMISSION_DENIED = "XXX"; [[Permission denied to an existing file (or path)]]
212var @beta Efl.Gfx.Image.Load_Error.RESOURCE_ALLOCATION_FAILED: Eina.Error; [[Allocation of resources failure prevented load]] 212error @extern @beta Efl.Gfx.Image.Load_Error.RESOURCE_ALLOCATION_FAILED = "XXX"; [[Allocation of resources failure prevented load]]
213var @beta Efl.Gfx.Image.Load_Error.CORRUPT_FILE: Eina.Error; [[File corrupt (but was detected as a known format)]] 213error @extern @beta Efl.Gfx.Image.Load_Error.CORRUPT_FILE = "XXX"; [[File corrupt (but was detected as a known format)]]
214var @beta Efl.Gfx.Image.Load_Error.UNKNOWN_FORMAT: Eina.Error; [[File is not a known format]] 214error @extern @beta Efl.Gfx.Image.Load_Error.UNKNOWN_FORMAT = "XXX"; [[File is not a known format]]
215var @beta Efl.Gfx.Image.Load_Error.CANCELLED: Eina.Error; [[Reading operation has been cancelled during decoding]] 215error @extern @beta Efl.Gfx.Image.Load_Error.CANCELLED = "XXX"; [[Reading operation has been cancelled during decoding]]
216var @beta Efl.Gfx.Image.Load_Error.INCOMPATIBLE_FILE: Eina.Error; [[(Edje only) The file pointed to is incompatible, i.e., it doesn't match the library's current version's format.]] 216error @extern @beta Efl.Gfx.Image.Load_Error.INCOMPATIBLE_FILE = "XXX"; [[(Edje only) The file pointed to is incompatible, i.e., it doesn't match the library's current version's format.]]
217var @beta Efl.Gfx.Image.Load_Error.UNKNOWN_COLLECTION: Eina.Error; [[(Edje only) The group/collection set to load from was not found in the file]] 217error @extern @beta Efl.Gfx.Image.Load_Error.UNKNOWN_COLLECTION = "XXX"; [[(Edje only) The group/collection set to load from was not found in the file]]
218var @beta Efl.Gfx.Image.Load_Error.RECURSIVE_REFERENCE: Eina.Error; [[(Edje only) The group/collection set to load from had recursive references on its components]] 218error @extern @beta Efl.Gfx.Image.Load_Error.RECURSIVE_REFERENCE = "XXX"; [[(Edje only) The group/collection set to load from had recursive references on its components]]
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index e5b5b6b..a4285ef 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -137,6 +137,9 @@ extern "C" {
137 137
138extern EAPI double _efl_startup_time; 138extern EAPI double _efl_startup_time;
139 139
140/** Successfully applied the requested style from the current theme. */
141extern EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_NONE;
142
140// EO types. Defined for legacy-only builds as legacy uses typedef of EO types. 143// EO types. Defined for legacy-only builds as legacy uses typedef of EO types.
141#include "efl_ui.eot.h" 144#include "efl_ui.eot.h"
142#include "efl_ui_selection_types.eot.h" 145#include "efl_ui_selection_types.eot.h"
diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot
index f0b5e6c..4e66511 100644
--- a/src/lib/elementary/efl_ui.eot
+++ b/src/lib/elementary/efl_ui.eot
@@ -1,11 +1,16 @@
1/* Efl.Ui enum and struct types */ 1/* Efl.Ui enum and struct types */
2import eina_types; 2import eina_types;
3 3
4var Efl.Ui.Theme.Apply_Error.NONE: Eina.Error; [[Successfully applied the requested style from the current theme.]] 4/* FIXME: find a better way to express this */
5var Efl.Ui.Theme.Apply_Error.DEFAULT: Eina.Error; [[Successfully applied the default style. The widget may 5error @extern Efl.Ui.Theme.Apply_Error.NONE = "Succcess"; [[Successfully applied the requested style from the current theme.]]
6 look different from the rest of the UI if a custom theme 6
7 is in use, but it should be usable.]] 7error Efl.Ui.Theme.Apply_Error.DEFAULT = "Fallback to default style was enabled for this widget"; [[
8var Efl.Ui.Theme.Apply_Error.GENERIC: Eina.Error; [[Failed to apply theme. The widget may become unusable.]] 8 Successfully applied the default style. The widget may look different from
9 the rest of the UI if a custom theme is in use, but it should be usable.
10]]
11error Efl.Ui.Theme.Apply_Error.GENERIC = "An error occurred and no theme could be set for this widget"; [[
12 Failed to apply theme. The widget may become unusable.
13]]
9 14
10enum Efl.Ui.Focus.Direction 15enum Efl.Ui.Focus.Direction
11{ 16{
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index dfc81ef..0d781a9 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -405,16 +405,14 @@ _sys_lang_changed(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA
405} 405}
406 406
407EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_NONE = 0; 407EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_NONE = 0;
408EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_DEFAULT = 0;
409EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_GENERIC = 0;
410 408
411static void 409static void
412_efl_ui_theme_apply_error_init(void) 410_efl_ui_theme_apply_error_init(void)
413{ 411{
414 if (EFL_UI_THEME_APPLY_ERROR_DEFAULT) return; 412 if (EFL_UI_THEME_APPLY_ERROR_DEFAULT) return;
415 /* NONE should always be 0 */ 413 /* NONE should always be 0 */
416 EFL_UI_THEME_APPLY_ERROR_DEFAULT = eina_error_msg_static_register("Fallback to default style was enabled for this widget"); 414 EFL_UI_THEME_APPLY_ERROR_DEFAULT;
417 EFL_UI_THEME_APPLY_ERROR_GENERIC = eina_error_msg_static_register("An error occurred and no theme could be set for this widget"); 415 EFL_UI_THEME_APPLY_ERROR_GENERIC;
418} 416}
419 417
420// This is necessary to keep backward compatibility 418// This is necessary to keep backward compatibility
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index 7afc2d2..ab8ea9a 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -300,6 +300,9 @@
300#include "elm_object_item.h" 300#include "elm_object_item.h"
301#include "efl_ui.eot.h" 301#include "efl_ui.eot.h"
302typedef Eo Efl_Ui_Focus_Manager; 302typedef Eo Efl_Ui_Focus_Manager;
303
304extern EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_NONE;
305
303#define _EFL_UI_FOCUS_MANAGER_EO_CLASS_TYPE 306#define _EFL_UI_FOCUS_MANAGER_EO_CLASS_TYPE
304#include "efl_ui_focus_object.eo.h" 307#include "efl_ui_focus_object.eo.h"
305#include "efl_ui_focus_manager.eo.h" 308#include "efl_ui_focus_manager.eo.h"
diff --git a/src/lib/eolian/database_var.c b/src/lib/eolian/database_var.c
index 4007091..5029e52 100644
--- a/src/lib/eolian/database_var.c
+++ b/src/lib/eolian/database_var.c
@@ -33,6 +33,7 @@ database_var_constant_add(Eolian_Unit *unit, Eolian_Variable *var)
33 EOLIAN_OBJECT_ADD(unit, var->base.name, var, constants); 33 EOLIAN_OBJECT_ADD(unit, var->base.name, var, constants);
34 eina_hash_set(unit->state->staging.constants_f, var->base.file, eina_list_append 34 eina_hash_set(unit->state->staging.constants_f, var->base.file, eina_list_append
35 ((Eina_List*)eina_hash_find(unit->state->staging.constants_f, var->base.file), var)); 35 ((Eina_List*)eina_hash_find(unit->state->staging.constants_f, var->base.file), var));
36 database_object_add(unit, &var->base);
36} 37}
37 38
38void 39void