summaryrefslogtreecommitdiff
path: root/src/modules/ecore
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2017-11-14 20:08:09 -0800
committerCedric Bail <cedric@osg.samsung.com>2017-11-14 20:08:09 -0800
commit663e31413a21030be8989eee82204f9351d2517c (patch)
tree8e255086a213704428078edfd57ce3727e0fb68b /src/modules/ecore
parent2cea85db388d34337676466ef7f50c22e685c7d0 (diff)
Revert "Revert series of patches from cedric (due to dependencies and conflicts)"
This reverts commit 2cea85db388d34337676466ef7f50c22e685c7d0. Their was a typo that I made during cleanup of the patch before pushing that I didn't notice broke some stuff. But also you may have an old efl_general.h in your elementary directory that is now being picked instead of the one provided by the tree.
Diffstat (limited to 'src/modules/ecore')
-rw-r--r--src/modules/ecore/system/upower/ecore_system_upower.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/modules/ecore/system/upower/ecore_system_upower.c b/src/modules/ecore/system/upower/ecore_system_upower.c
index abc621ff7a..8a73ac44ac 100644
--- a/src/modules/ecore/system/upower/ecore_system_upower.c
+++ b/src/modules/ecore/system/upower/ecore_system_upower.c
@@ -149,7 +149,8 @@ _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 ERR("Message error %s - %s", errname, errmsg); 152 if (strcmp(errname, "org.enlightenment.DBus.Canceled"))
153 ERR("Message error %s - %s", errname, errmsg);
153 return; 154 return;
154 } 155 }
155 if (!eldbus_message_arguments_get(msg, "v", &variant)) 156 if (!eldbus_message_arguments_get(msg, "v", &variant))
@@ -197,7 +198,8 @@ _on_battery_get_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
197 _eldbus_pending = eina_list_remove(_eldbus_pending, pending); 198 _eldbus_pending = eina_list_remove(_eldbus_pending, pending);
198 if (eldbus_message_error_get(msg, &errname, &errmsg)) 199 if (eldbus_message_error_get(msg, &errname, &errmsg))
199 { 200 {
200 ERR("Message error %s - %s", errname, errmsg); 201 if (strcmp(errname, "org.enlightenment.DBus.Canceled"))
202 ERR("Message error %s - %s", errname, errmsg);
201 return; 203 return;
202 } 204 }
203 if (!eldbus_message_arguments_get(msg, "v", &variant)) 205 if (!eldbus_message_arguments_get(msg, "v", &variant))
@@ -285,7 +287,8 @@ _daemon_version_get_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
285 _eldbus_pending = eina_list_remove(_eldbus_pending, pending); 287 _eldbus_pending = eina_list_remove(_eldbus_pending, pending);
286 if (eldbus_message_error_get(msg, &errname, &errmsg)) 288 if (eldbus_message_error_get(msg, &errname, &errmsg))
287 { 289 {
288 ERR("Message error %s - %s", errname, errmsg); 290 if (strcmp(errname, "org.enlightenment.DBus.Canceled"))
291 ERR("Message error %s - %s", errname, errmsg);
289 return; 292 return;
290 } 293 }
291 if (!eldbus_message_arguments_get(msg, "v", &variant)) 294 if (!eldbus_message_arguments_get(msg, "v", &variant))