From d9e03f2642a100bad7aeb290f68293abba21be2a Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 18 Feb 2008 22:45:31 +0100 Subject: [PATCH] Update for libgdbus API change --- plugins/dhclient.c | 2 +- src/main.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/plugins/dhclient.c b/plugins/dhclient.c index cc5efd8..211b84e 100644 --- a/plugins/dhclient.c +++ b/plugins/dhclient.c @@ -279,7 +279,7 @@ static DBusConnection *connection; static int plugin_init(void) { - connection = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL); + connection = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL); busname = dbus_bus_get_unique_name(connection); diff --git a/src/main.c b/src/main.c index a54eaf6..0fcf614 100644 --- a/src/main.c +++ b/src/main.c @@ -68,6 +68,7 @@ static struct option options[] = { int main(int argc, char *argv[]) { DBusConnection *conn; + DBusError err; struct sigaction sa; int log_option = LOG_NDELAY | LOG_PID; int opt, detach = 1, compat = 0; @@ -109,14 +110,20 @@ int main(int argc, char *argv[]) main_loop = g_main_loop_new(NULL, FALSE); - conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, CONNMAN_SERVICE); + dbus_error_init(&err); + + conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, CONNMAN_SERVICE, &err); if (conn == NULL) { - fprintf(stderr, "Can't register with system bus\n"); + if (dbus_error_is_set(&err) == TRUE) { + fprintf(stderr, "%s\n", err.message); + dbus_error_free(&err); + } else + fprintf(stderr, "Can't register with system bus\n"); exit(1); } if (compat) { - if (g_dbus_request_name(conn, NM_SERVICE) == FALSE) + if (g_dbus_request_name(conn, NM_SERVICE, NULL) == FALSE) compat = 0; } -- 2.7.4