cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=99654b7cd29b418e0308be350c8d26208c0905a8

commit 99654b7cd29b418e0308be350c8d26208c0905a8
Author: Cedric BAIL <[email protected]>
Date:   Tue Nov 14 14:40:22 2017 -0800

    ecore: do not display error message on cancel.
---
 src/modules/ecore/system/upower/ecore_system_upower.c | 9 ++++++---
 1 file 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,
    _eldbus_pending = eina_list_remove(_eldbus_pending, pending);
    if (eldbus_message_error_get(msg, &errname, &errmsg))
      {
-        ERR("Message error %s - %s", errname, errmsg);
+        if (strcmp(errname, "org.enlightenment.DBus.Canceled"))
+          ERR("Message error %s - %s", errname, errmsg);
         return;
      }
    if (!eldbus_message_arguments_get(msg, "v", &variant))
@@ -197,7 +198,8 @@ _on_battery_get_cb(void *data EINA_UNUSED, const 
Eldbus_Message *msg,
    _eldbus_pending = eina_list_remove(_eldbus_pending, pending);
    if (eldbus_message_error_get(msg, &errname, &errmsg))
      {
-        ERR("Message error %s - %s", errname, errmsg);
+        if (strcmp(errname, "org.enlightenment.DBus.Canceled"))
+          ERR("Message error %s - %s", errname, errmsg);
         return;
      }
    if (!eldbus_message_arguments_get(msg, "v", &variant))
@@ -285,7 +287,8 @@ _daemon_version_get_cb(void *data EINA_UNUSED, const 
Eldbus_Message *msg,
    _eldbus_pending = eina_list_remove(_eldbus_pending, pending);
    if (eldbus_message_error_get(msg, &errname, &errmsg))
      {
-        ERR("Message error %s - %s", errname, errmsg);
+        if (strcmp(errname, "org.enlightenment.DBus.Canceled"))
+          ERR("Message error %s - %s", errname, errmsg);
         return;
      }
    if (!eldbus_message_arguments_get(msg, "v", &variant))

-- 


Reply via email to