summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-15 11:48:25 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-15 11:48:55 +0900
commit2cea85db388d34337676466ef7f50c22e685c7d0 (patch)
treedb77053452fbdd3711ac90a14b8a1e88af517328
parent44bb0c18480f5094fcd0c8be93de87be5c1d78c5 (diff)
Revert series of patches from cedric (due to dependencies and conflicts)
Revert "elementary: currently double declare elm_init/shutdown." This reverts commit 44bb0c18480f5094fcd0c8be93de87be5c1d78c5. Revert "elementary: fix efl_ui_multibutton installed headers." This reverts commit 32a213dc722be2bfec5fb2b513dd556cfb7e9f33. Revert "elementary: introduce Efl_Ui.h." This reverts commit df3d3f7334a79f1ab661b31787002f50af59b3f3. Revert "ecore: do not display error message on cancel." This reverts commit 99654b7cd29b418e0308be350c8d26208c0905a8. Revert "efl: and don't forget to install the new dependencies." This reverts commit 814ffb9b6bd50d498bfd98f4b8a75f1cad3cc0cf. Revert "ecore: remove EFL_OBJECT_BETA as Efl_Core.h is for Efl new inerfaces." This reverts commit 619d0f3cff023414feb8f2aaeebf468806c50b44. Revert "ecore: move EAPI_MAIN from elementary to ecore." This reverts commit e5d84da864214b9f772808040f22e1614889a25f. as such commit e5d84da864214b9f772808040f22e1614889a25f starts the breaking. enlightenment, terminologya and other apps can't compile against that efl anymore. 619d0f3cff023414feb8f2aaeebf468806c50b44 then makes this even worse with even more header errors and undefined types. on top of this df3d3f7334a79f1ab661b31787002f50af59b3f3 then starts making elementary_test segfault when it runs. it wont even start up. asu such of these 7 commits in the first 4 (that are then relied on later) 3 of these first 4 cause serious breakage. this simply is a complete lack of testing changes, so i've rolled fl back to before these things so it builds and works again and you can build against it. PLEASE test these things. this looks ot me to be obviously a lack of any testing... :(
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac1
-rw-r--r--pc/.gitignore1
-rw-r--r--pc/efl-ui.pc.in20
-rw-r--r--src/Makefile_Elementary.am4
-rw-r--r--src/lib/ecore/Efl_Core.h4
-rw-r--r--src/lib/ecore/efl_general.h17
-rw-r--r--src/lib/elementary/Efl_Ui.h253
-rw-r--r--src/lib/elementary/Elementary.h4
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry.h1
-rw-r--r--src/lib/elementary/elm_general.h4
-rw-r--r--src/modules/ecore/system/upower/ecore_system_upower.c9
12 files changed, 16 insertions, 307 deletions
diff --git a/Makefile.am b/Makefile.am
index 8fb921c..1106b60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -136,9 +136,7 @@ pc/emile.pc \
136pc/eet.pc \ 136pc/eet.pc \
137pc/evas.pc \ 137pc/evas.pc \
138pc/ecore.pc \ 138pc/ecore.pc \
139pc/efl-core.pc \
140pc/ecore-con.pc \ 139pc/ecore-con.pc \
141pc/efl-net.pc \
142pc/ecore-ipc.pc \ 140pc/ecore-ipc.pc \
143pc/ecore-file.pc \ 141pc/ecore-file.pc \
144pc/ecore-input.pc \ 142pc/ecore-input.pc \
@@ -159,8 +157,7 @@ pc/emotion.pc \
159pc/ethumb.pc \ 157pc/ethumb.pc \
160pc/ethumb_client.pc \ 158pc/ethumb_client.pc \
161pc/elocation.pc \ 159pc/elocation.pc \
162pc/elementary.pc \ 160pc/elementary.pc
163pc/efl-ui.pc
164 161
165if HAVE_CXX11 162if HAVE_CXX11
166pkgconfig_DATA += \ 163pkgconfig_DATA += \
diff --git a/configure.ac b/configure.ac
index 003190b..ba9b783 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5606,7 +5606,6 @@ pc/efl-cxx.pc
5606pc/efl-wl.pc 5606pc/efl-wl.pc
5607pc/efl-core.pc 5607pc/efl-core.pc
5608pc/efl-net.pc 5608pc/efl-net.pc
5609pc/efl-ui.pc
5610pc/evas-fb.pc 5609pc/evas-fb.pc
5611pc/evas-eglfs.pc 5610pc/evas-eglfs.pc
5612pc/evas-opengl-x11.pc 5611pc/evas-opengl-x11.pc
diff --git a/pc/.gitignore b/pc/.gitignore
index 5657ab6..5e87ab1 100644
--- a/pc/.gitignore
+++ b/pc/.gitignore
@@ -76,4 +76,3 @@
76/efl-wl.pc 76/efl-wl.pc
77/efl-core.pc 77/efl-core.pc
78/efl-net.pc 78/efl-net.pc
79/efl-ui.pc \ No newline at end of file
diff --git a/pc/efl-ui.pc.in b/pc/efl-ui.pc.in
deleted file mode 100644
index 04c9dcf..0000000
--- a/pc/efl-ui.pc.in
+++ /dev/null
@@ -1,20 +0,0 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5datarootdir=@datarootdir@
6datadir=@datadir@/elementary
7pkgdatadir=@datadir@/elementary
8vmaj=@VMAJ@
9vmin=@VMIN@
10vmic=@VMIC@
11themes=${pkgdatadir}/themes
12eoincludedir=@datadir@/eolian/include
13eolian_flags=-I${pc_sysrootdir}${eoincludedir}/elementary-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/emap-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/elocation-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/efreet-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/edje-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/eio-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/eldbus-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/ecore-con-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/ecore-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/efl-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/eo-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/eet-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/emile-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/eina-@VMAJ@
14
15Name: efl_ui
16Description: EFL user interface abstraction library
17Requires.private: @requirements_pc_elementary@
18Version: @VERSION@
19Libs: -L${libdir} -lelementary -lefl -leina -lpthread -leet -levas -lecore -lecore_evas -lecore_file -lecore_input -ledje -leo -lethumb_client -lemotion -lecore_imf -lecore_con -leldbus -lefreet -lefreet_mime -lefreet_trash -leio @requirements_public_libs_elementary@ @requirements_public_libs_eina@ @requirements_libs_eina@ @requirements_libs_elm@
20Cflags: -I${includedir}/elementary-@VMAJ@ -I${includedir}/emap-@VMAJ@ -I${includedir}/elocation-@VMAJ@ -I${includedir}/efreet-@VMAJ@ -I${includedir}/edje-@VMAJ@ -I${includedir}/eio-@VMAJ@ -I${includedir}/eldbus-@VMAJ@ -I${includedir}/ecore-@VMAJ@ -I${includedir}/efl-@VMAJ@ -I${includedir}/eo-@VMAJ@ -I${includedir}/eet-@VMAJ@ -I${includedir}/emile-@VMAJ@ -I${includedir}/eina-@VMAJ@
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 95d1cf8..4c79dc8 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -324,9 +324,7 @@ includesunstable_HEADERS = \
324 lib/elementary/elm_code_indent.h \ 324 lib/elementary/elm_code_indent.h \
325 lib/elementary/elm_code_file.h \ 325 lib/elementary/elm_code_file.h \
326 lib/elementary/elm_code_parse.h \ 326 lib/elementary/elm_code_parse.h \
327 lib/elementary/elm_code_syntax.h \ 327 lib/elementary/elm_code_syntax.h
328 lib/elementary/efl_ui_multibuttonentry.h \
329 lib/elementary/Efl_Ui.h
330includesunstabledir = $(includedir)/elementary-@VMAJ@ 328includesunstabledir = $(includedir)/elementary-@VMAJ@
331 329
332nodist_includesunstable_HEADERS = \ 330nodist_includesunstable_HEADERS = \
diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h
index 8981d48..585f847 100644
--- a/src/lib/ecore/Efl_Core.h
+++ b/src/lib/ecore/Efl_Core.h
@@ -64,7 +64,9 @@ extern "C" {
64extern EAPI double _efl_startup_time; 64extern EAPI double _efl_startup_time;
65 65
66#include "Ecore_Common.h" 66#include "Ecore_Common.h"
67#include "Ecore_Eo.h" 67#ifdef EFL_OBJECT_BETA
68# include "Ecore_Eo.h"
69#endif
68 70
69#ifdef __cplusplus 71#ifdef __cplusplus
70} 72}
diff --git a/src/lib/ecore/efl_general.h b/src/lib/ecore/efl_general.h
index 3a79e46..c91f61f 100644
--- a/src/lib/ecore/efl_general.h
+++ b/src/lib/ecore/efl_general.h
@@ -13,23 +13,6 @@
13#undef __EFL_NET 13#undef __EFL_NET
14#undef EFL_MAIN 14#undef EFL_MAIN
15#undef EFL_MAIN_EX 15#undef EFL_MAIN_EX
16#undef EAPI_MAIN
17
18#ifdef _WIN32
19// There is no support for quicklaunch on windows, so no needs
20// to export the efl_main symbol
21# define EAPI_MAIN
22#else
23# ifdef __GNUC__
24# if __GNUC__ >= 4
25# define EAPI_MAIN __attribute__ ((visibility("default")))
26# else
27# define EAPI_MAIN
28# endif
29# else
30# define EAPI_MAIN
31# endif
32#endif /* ! _WIN32 */
33 16
34#ifdef EFL_VERSION_MICRO 17#ifdef EFL_VERSION_MICRO
35# define _EFL_VERSION_MICRO EFL_VERSION_MICRO 18# define _EFL_VERSION_MICRO EFL_VERSION_MICRO
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
deleted file mode 100644
index 75c3e3c..0000000
--- a/src/lib/elementary/Efl_Ui.h
+++ /dev/null
@@ -1,253 +0,0 @@
1#ifndef _EFL_CORE_H
2#define _EFL_CORE_H
3
4#include <Efl_Config.h>
5#include <Elementary_Options.h>
6
7#ifdef _MSC_VER
8# include <Evil.h>
9#endif
10
11/* Standard headers for standard system calls etc. */
12#include <stdio.h>
13#include <stdlib.h>
14#include <unistd.h>
15#include <string.h>
16#include <sys/types.h>
17#include <sys/stat.h>
18#include <sys/time.h>
19#include <sys/param.h>
20#include <math.h>
21#include <fnmatch.h>
22#include <limits.h>
23#include <ctype.h>
24#include <time.h>
25#ifdef ELM_DIRENT_H
26#include <dirent.h>
27#endif
28#include <pwd.h>
29#include <errno.h>
30
31#ifdef ELM_UNIX
32#include <locale.h>
33#ifdef ELM_LIBINTL_H
34#include <libintl.h>
35#endif
36#include <signal.h>
37#include <grp.h>
38#include <glob.h>
39#endif
40
41#ifdef ELM_ALLOCA_H
42#include <alloca.h>
43#endif
44
45#ifdef ELM_WIN32
46#include <malloc.h>
47#ifndef alloca
48#define alloca _alloca
49#endif
50#endif
51
52#include <Eina.h>
53#include <Eo.h>
54#include <Efl.h>
55
56#ifdef EAPI
57# undef EAPI
58#endif
59
60#ifdef _WIN32
61# ifdef EFL_ECORE_BUILD
62# ifdef DLL_EXPORT
63# define EAPI __declspec(dllexport)
64# else
65# define EAPI
66# endif /* ! DLL_EXPORT */
67# else
68# define EAPI __declspec(dllimport)
69# endif /* ! EFL_ECORE_BUILD */
70#else
71# ifdef __GNUC__
72# if __GNUC__ >= 4
73# define EAPI __attribute__ ((visibility("default")))
74# else
75# define EAPI
76# endif
77# else
78# define EAPI
79# endif
80#endif /* ! _WIN32 */
81
82#ifdef _WIN32
83# define WIN32_LEAN_AND_MEAN
84# include <winsock2.h>
85# undef WIN32_LEAN_AND_MEAN
86#elif defined (__FreeBSD__) || defined (__OpenBSD__)
87# include <sys/select.h>
88# include <signal.h>
89#elif defined (__ANDROID__)
90# include <sys/select.h>
91#elif defined (__sun)
92# include <sys/siginfo.h>
93#else
94# include <sys/time.h>
95# if !defined (EXOTIC_NO_SIGNAL)
96# include <signal.h>
97# endif
98#endif
99
100#include <sys/types.h>
101
102#define __EFL_UI_IS_REQUIRED
103
104#include <Efl_Net.h>
105
106#include <Evas.h>
107#include <Evas_GL.h>
108#include <Eio.h>
109#include <Edje.h>
110#include <Eldbus.h>
111#include <Efreet.h>
112#include <Efreet_Mime.h>
113#include <Efreet_Trash.h>
114#include <Ethumb_Client.h>
115
116#ifdef ELM_ELOCATION
117#include <Elocation.h>
118#endif
119
120#ifdef ELM_EMAP
121#include <EMap.h>
122#endif
123
124#ifdef __cplusplus
125extern "C" {
126#endif
127
128extern EAPI double _efl_startup_time;
129
130// EO types. Defined for legacy-only builds as legacy uses typedef of EO types.
131#include "efl_ui.eot.h"
132
133# include <efl_ui_focus_object.eo.h>
134# include <efl_ui_focus_manager.eo.h>
135# include <efl_ui_focus_manager_calc.eo.h>
136# include <efl_ui_focus_manager_sub.eo.h>
137# include <efl_ui_focus_manager_root_focus.eo.h>
138# include <efl_ui_focus_user.eo.h>
139# include <efl_ui_textpath.eo.h>
140# include <efl_ui_translatable.eo.h>
141# include <efl_ui_focus_composition.eo.h>
142# include <efl_ui_focus_layer.eo.h>
143# include <efl_access.h>
144# include <efl_access_text.h>
145# include <efl_access_window.h>
146
147# include <efl_access_action.eo.h>
148# include <efl_access_component.eo.h>
149# include <efl_access_editable_text.eo.h>
150# include <efl_access_image.eo.h>
151# include <efl_access_selection.eo.h>
152# include <efl_access_value.eo.h>
153
154# include <efl_config_global.eo.h>
155# include <efl_ui_widget_part.eo.h>
156# include <efl_ui_layout_part.eo.h>
157# include <efl_ui_layout_part_box.eo.h>
158# include <efl_ui_layout_part_content.eo.h>
159# include <efl_ui_layout_part_text.eo.h>
160# include <efl_ui_layout_part_table.eo.h>
161# include <efl_ui_win_part.eo.h>
162# include <efl_ui_box.eo.h>
163# include <efl_ui_box_flow.eo.h>
164# include <efl_ui_box_stack.eo.h>
165# include <efl_ui_grid.eo.h>
166# include <efl_ui_grid_static.eo.h>
167# include <efl_ui_image.eo.h>
168# include <efl_ui_win.eo.h>
169# include <efl_ui_win_inlined.eo.h>
170# include <efl_ui_win_socket.eo.h>
171# include <efl_ui_text_interactive.eo.h>
172# include <efl_ui_text.eo.h>
173# include <efl_ui_text_editable.eo.h>
174# include <efl_ui_text_async.eo.h>
175# include <efl_ui_clock.h>
176# include <efl_ui_image_factory.eo.h>
177# include <efl_ui_video.h>
178# include <efl_ui_nstate.h>
179# include <efl_ui_calendar.h>
180# include <efl_ui_button_eo.h>
181# include <efl_ui_multibuttonentry.h>
182# include <efl_ui_slider_eo.h>
183# include <efl_ui_flip_eo.h>
184# include <efl_ui_frame_eo.h>
185# include <efl_ui_check_eo.h>
186# include <efl_ui_image_zoomable_eo.h>
187# include <efl_ui_progressbar_eo.h>
188# include <efl_ui_radio_eo.h>
189# include <efl_ui_bg_eo.h>
190# include <efl_ui_panes_eo.h>
191
192/**
193 * Initialize Elementary
194 *
195 * @param[in] argc System's argument count value
196 * @param[in] argv System's pointer to array of argument strings
197 * @return The init counter value.
198 *
199 * This function initializes Elementary and increments a counter of
200 * the number of calls to it. It returns the new counter's value.
201 *
202 * @warning This call is exported only for use by the @c ELM_MAIN()
203 * macro. There is no need to use this if you use this macro (which
204 * is highly advisable). An elm_main() should contain the entry
205 * point code for your application, having the same prototype as
206 * elm_init(), and @b not being static (putting the @c EAPI_MAIN symbol
207 * in front of its type declaration is advisable). The @c
208 * ELM_MAIN() call should be placed just after it.
209 *
210 * Example:
211 * @dontinclude bg_example_01.c
212 * @skip static void
213 * @until ELM_MAIN
214 *
215 * See the full @ref bg_example_01_c "example".
216 *
217 * @see elm_shutdown().
218 * @ingroup Elm_General
219 */
220EAPI int elm_init(int argc, char **argv);
221
222/**
223 * Shut down Elementary
224 *
225 * @return The init counter value.
226 *
227 * This should be called at the end of your application, just
228 * before it ceases to do any more processing. This will clean up
229 * any permanent resources your application may have allocated via
230 * Elementary that would otherwise persist.
231 *
232 * @see elm_init() for an example
233 *
234 * @note elm_shutdown() will iterate main loop until all ecore_evas are freed.
235 * There is a possibility to call your ecore callbacks(timer, animator, event,
236 * job, and etc.) in elm_shutdown()
237 *
238 * @ingroup Elm_General
239 */
240EAPI int elm_shutdown(void);
241
242#ifdef __cplusplus
243}
244#endif
245
246#undef EAPI
247#define EAPI
248
249#endif
250
251// We are including efl_general.h again, just in case Efl_Core.h was already included before this
252// and the __EFL_*_IS_REQUIRED changed since then.
253#include <efl_general.h>
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index bf41fde..3913084 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -85,6 +85,7 @@
85#endif 85#endif
86 86
87#ifdef _WIN32 87#ifdef _WIN32
88# define EAPI_MAIN
88# ifdef ELEMENTARY_BUILD 89# ifdef ELEMENTARY_BUILD
89# ifdef DLL_EXPORT 90# ifdef DLL_EXPORT
90# define EAPI __declspec(dllexport) 91# define EAPI __declspec(dllexport)
@@ -98,11 +99,14 @@
98# ifdef __GNUC__ 99# ifdef __GNUC__
99# if __GNUC__ >= 4 100# if __GNUC__ >= 4
100# define EAPI __attribute__ ((visibility("default"))) 101# define EAPI __attribute__ ((visibility("default")))
102# define EAPI_MAIN __attribute__ ((visibility("default")))
101# else 103# else
102# define EAPI 104# define EAPI
105# define EAPI_MAIN
103# endif 106# endif
104# else 107# else
105# define EAPI 108# define EAPI
109# define EAPI_MAIN
106# endif 110# endif
107#endif /* ! _WIN32 */ 111#endif /* ! _WIN32 */
108 112
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.h b/src/lib/elementary/efl_ui_multibuttonentry.h
index 3d9a759..3c76aa7 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.h
+++ b/src/lib/elementary/efl_ui_multibuttonentry.h
@@ -57,6 +57,7 @@
57 * @{ 57 * @{
58 */ 58 */
59 59
60#include "efl_ui_multibuttonentry_common.h"
60#ifdef EFL_EO_API_SUPPORT 61#ifdef EFL_EO_API_SUPPORT
61#include "efl_ui_multibuttonentry_eo.h" 62#include "efl_ui_multibuttonentry_eo.h"
62#endif 63#endif
diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h
index 7564f12..d718594 100644
--- a/src/lib/elementary/elm_general.h
+++ b/src/lib/elementary/elm_general.h
@@ -96,7 +96,9 @@ extern EAPI double _elm_startup_time;
96#define ELM_MAIN() int main(int argc, char **argv) { int ret__; _elm_startup_time = ecore_time_unix_get(); ret__ = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret__; } 96#define ELM_MAIN() int main(int argc, char **argv) { int ret__; _elm_startup_time = ecore_time_unix_get(); ret__ = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret__; }
97#endif 97#endif
98 98
99#include "Efl_Ui.h" 99#define __EFL_UI_IS_REQUIRED
100
101#include "Efl_Core.h"
100 102
101/**************************************************************************/ 103/**************************************************************************/
102/* General calls */ 104/* General calls */
diff --git a/src/modules/ecore/system/upower/ecore_system_upower.c b/src/modules/ecore/system/upower/ecore_system_upower.c
index 8a73ac4..abc621f 100644
--- a/src/modules/ecore/system/upower/ecore_system_upower.c
+++ b/src/modules/ecore/system/upower/ecore_system_upower.c
@@ -149,8 +149,7 @@ _on_low_battery_get_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
149 _eldbus_pending = eina_list_remove(_eldbus_pending, pending); 149 _eldbus_pending = eina_list_remove(_eldbus_pending, pending);
150 if (eldbus_message_error_get(msg, &errname, &errmsg)) 150 if (eldbus_message_error_get(msg, &errname, &errmsg))
151 { 151 {
152 if (strcmp(errname, "org.enlightenment.DBus.Canceled")) 152 ERR("Message error %s - %s", errname, errmsg);
153 ERR("Message error %s - %s", errname, errmsg);
154 return; 153 return;
155 } 154 }
156 if (!eldbus_message_arguments_get(msg, "v", &variant)) 155 if (!eldbus_message_arguments_get(msg, "v", &variant))
@@ -198,8 +197,7 @@ _on_battery_get_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
198 _eldbus_pending = eina_list_remove(_eldbus_pending, pending); 197 _eldbus_pending = eina_list_remove(_eldbus_pending, pending);
199 if (eldbus_message_error_get(msg, &errname, &errmsg)) 198 if (eldbus_message_error_get(msg, &errname, &errmsg))
200 { 199 {
201 if (strcmp(errname, "org.enlightenment.DBus.Canceled")) 200 ERR("Message error %s - %s", errname, errmsg);
202 ERR("Message error %s - %s", errname, errmsg);
203 return; 201 return;
204 } 202 }
205 if (!eldbus_message_arguments_get(msg, "v", &variant)) 203 if (!eldbus_message_arguments_get(msg, "v", &variant))
@@ -287,8 +285,7 @@ _daemon_version_get_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
287 _eldbus_pending = eina_list_remove(_eldbus_pending, pending); 285 _eldbus_pending = eina_list_remove(_eldbus_pending, pending);
288 if (eldbus_message_error_get(msg, &errname, &errmsg)) 286 if (eldbus_message_error_get(msg, &errname, &errmsg))
289 { 287 {
290 if (strcmp(errname, "org.enlightenment.DBus.Canceled")) 288 ERR("Message error %s - %s", errname, errmsg);
291 ERR("Message error %s - %s", errname, errmsg);
292 return; 289 return;
293 } 290 }
294 if (!eldbus_message_arguments_get(msg, "v", &variant)) 291 if (!eldbus_message_arguments_get(msg, "v", &variant))