Update for libgdbus API change

diff --git a/plugins/dhclient.c b/plugins/dhclient.c
index cc5efd8..211b84e 100644 (file)
--- 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 (file)
--- 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;
        }