From ec0e7836cf9369bfc2a962f14a488d9246797326 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 12 Aug 2011 11:45:08 +0300 Subject: [PATCH] obexd: move __obex_log_init before manager_init This enables us to log target during initialization --- obexd/client/main.c | 4 ++-- obexd/client/manager.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/obexd/client/main.c b/obexd/client/main.c index 618ad21d8..80f94139f 100644 --- a/obexd/client/main.c +++ b/obexd/client/main.c @@ -87,11 +87,11 @@ int main(int argc, char *argv[]) event_loop = g_main_loop_new(NULL, FALSE); + __obex_log_init("obex-client", option_debug, !option_stderr); + if (manager_init() < 0) exit(EXIT_FAILURE); - __obex_log_init("obex-client", option_debug, !option_stderr); - DBG("Entering main loop"); memset(&sa, 0, sizeof(sa)); diff --git a/obexd/client/manager.c b/obexd/client/manager.c index b13dd78e4..a272a87b4 100644 --- a/obexd/client/manager.c +++ b/obexd/client/manager.c @@ -571,7 +571,7 @@ int manager_init(void) conn = g_dbus_setup_bus(DBUS_BUS_SESSION, CLIENT_SERVICE, &derr); if (dbus_error_is_set(&derr) == TRUE) { - g_printerr("%s: %s\n", derr.name, derr.message); + error("%s: %s", derr.name, derr.message); dbus_error_free(&derr); return -1; } @@ -579,7 +579,7 @@ int manager_init(void) if (g_dbus_register_interface(conn, CLIENT_PATH, CLIENT_INTERFACE, client_methods, NULL, NULL, NULL, NULL) == FALSE) { - g_printerr("Can't register client interface\n"); + error("Can't register client interface"); dbus_connection_unref(conn); conn = NULL; return -1; -- 2.47.3