diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-04-16 11:01:11 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-04-16 11:01:22 +0200 |
| commit | 29cfcecb1b2d829848b1b530810a1b85155cc879 (patch) | |
| tree | e30be2d3a7a4caf0cdc41cb0f145e8076807f3ab | |
| parent | 660d57b5b01ec0bb683d96366d0cfeb149c43780 (diff) | |
| download | remote-logon-service-29cfcecb1b2d829848b1b530810a1b85155cc879.tar.gz remote-logon-service-29cfcecb1b2d829848b1b530810a1b85155cc879.tar.bz2 remote-logon-service-29cfcecb1b2d829848b1b530810a1b85155cc879.zip | |
Port to libnm (from libnm-glib).
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/uccs-server.c | 4 | ||||
| -rw-r--r-- | src/uccs-server.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 6355357..13418ee 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_CONFIG_FILES([ tests/Makefile ]) -PKG_CHECK_MODULES(SERVICE, glib-2.0 gio-2.0 gio-unix-2.0 json-glib-1.0 libnm-glib libsoup-2.4) +PKG_CHECK_MODULES(SERVICE, glib-2.0 gio-2.0 gio-unix-2.0 json-glib-1.0 libnm libsoup-2.4) PKG_CHECK_MODULES(TEST, dbustest-1) AC_CHECK_LIB(gcrypt, gcry_cipher_get_algo_keylen, GCRYPT_LIBS="-lgcrypt") diff --git a/debian/control b/debian/control index 323012f..0e19674 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: dbus-test-runner, libgcrypt11-dev, libglib2.0-dev (>= 2.29.19), libjson-glib-dev, - libnm-glib-dev, + libnm-dev, libsoup2.4-dev, dh-autoreconf, libgtest-dev, diff --git a/src/uccs-server.c b/src/uccs-server.c index c37e181..69c716b 100644 --- a/src/uccs-server.c +++ b/src/uccs-server.c @@ -115,7 +115,7 @@ uccs_server_init (UccsServer *self) if (g_strcmp0(g_getenv("DBUS_TEST_RUNNER"), "1")) { if (global_client == NULL) { - global_client = nm_client_new(); + global_client = nm_client_new(NULL, NULL); if (global_client != NULL) { g_object_add_weak_pointer(G_OBJECT(global_client), (gpointer *)&global_client); @@ -346,7 +346,7 @@ nm_state_changed (NMClient *client, const GParamSpec *pspec, gpointer user_data) g_return_if_fail(IS_UCCS_SERVER(user_data)); UccsServer * server = UCCS_SERVER(user_data); - if (server->nm_client == NULL || !nm_client_get_manager_running(server->nm_client)) { + if (server->nm_client == NULL || !nm_client_get_nm_running(server->nm_client)) { server->last_network = NM_STATE_DISCONNECTED; } else { server->last_network = nm_client_get_state(server->nm_client); diff --git a/src/uccs-server.h b/src/uccs-server.h index d9782af..4b54f51 100644 --- a/src/uccs-server.h +++ b/src/uccs-server.h @@ -22,7 +22,7 @@ #define __UCCS_SERVER_H__ #include <glib-object.h> -#include <libnm-glib/nm-client.h> +#include <libnm/NetworkManager.h> #include <libsoup/soup.h> #include "server.h" |