summaryrefslogtreecommitdiff
path: root/src/modules/ecore/system
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 /src/modules/ecore/system
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... :(
Diffstat (limited to 'src/modules/ecore/system')
-rw-r--r--src/modules/ecore/system/upower/ecore_system_upower.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/modules/ecore/system/upower/ecore_system_upower.c b/src/modules/ecore/system/upower/ecore_system_upower.c
index 8a73ac44ac..abc621ff7a 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))