From d3865646d308be9f0921d4f0470793d745f77da1 Mon Sep 17 00:00:00 2001 From: Jongmin Lee Date: Wed, 10 Jul 2019 16:55:54 +0900 Subject: [PATCH] e_dbus: do not print log when closing dbus connection. After calling e_dbus_shutdown(), dbus connection could be closed. In this case, if edbus tries to print log, then edbus get crashed because log domain is invalid (if abort_on_error option is enabled). Change-Id: I227750fa288a4b97f68ca5001eba55b87f2e24d9 --- src/lib/dbus/e_dbus.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/lib/dbus/e_dbus.c b/src/lib/dbus/e_dbus.c index 47d84bb..627732f 100644 --- a/src/lib/dbus/e_dbus.c +++ b/src/lib/dbus/e_dbus.c @@ -60,7 +60,6 @@ e_dbus_fd_handler_del(E_DBus_Handler_Data *hd) { if (!hd->fd_handler) return; - DBG("handler disabled"); hd->cd->fd_handlers = eina_list_remove(hd->cd->fd_handlers, hd->fd_handler); ecore_main_fd_handler_del(hd->fd_handler); hd->fd_handler = NULL; @@ -130,8 +129,7 @@ static void e_dbus_handler_data_free(void *data) { E_DBus_Handler_Data *hd = data; - - DBG("e_dbus_handler_data_free"); + if (hd->fd_handler) { hd->cd->fd_handlers = eina_list_remove(hd->cd->fd_handlers, hd->fd_handler); @@ -192,7 +190,6 @@ e_dbus_connection_free(void *data) E_DBus_Connection *cd = data; Ecore_Fd_Handler *fd_handler; Ecore_Timer *timer; - DBG("e_dbus_connection free!"); EINA_LIST_FREE(cd->fd_handlers, fd_handler) ecore_main_fd_handler_del(fd_handler); @@ -217,7 +214,6 @@ cb_dispatch_status(DBusConnection *conn __UNUSED__, DBusDispatchStatus new_statu { E_DBus_Connection *cd; - DBG("dispatch status: %d!", new_status); cd = data; if (new_status == DBUS_DISPATCH_DATA_REMAINS && !cd->idler) @@ -335,7 +331,6 @@ cb_watch_del(DBusWatch *watch, void *data __UNUSED__) { E_DBus_Handler_Data *hd; - DBG("cb_watch_del"); hd = (E_DBus_Handler_Data *)dbus_watch_get_data(watch); e_dbus_fd_handler_del(hd); } @@ -395,7 +390,6 @@ e_dbus_filter(DBusConnection *conn __UNUSED__, DBusMessage *message, void *user_ default: break; } - DBG("-----------------"); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -517,7 +511,6 @@ EAPI void e_dbus_connection_close(E_DBus_Connection *conn) { if (!conn) return; - DBG("e_dbus_connection_close"); if (e_dbus_idler_active) { -- 2.7.4