From dee4e692b4a8574841d4f26222098ee52944de01 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 13 Mar 2018 21:03:46 +0100 Subject: [PATCH] Fix bug 3895: Port from libnm-util/libnm-glib to libnm --- configure.ac | 2 +- src/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 58c63ace4..35e3b139e 100644 --- a/configure.ac +++ b/configure.ac @@ -874,7 +874,7 @@ dnl # Check for NetworkManager support dnl ####################################################################### if test x"$enable_dbus" = xyes; then if test x"$enable_networkmanager" = xyes; then - PKG_CHECK_MODULES(NETWORKMANAGER_SUPPORT, NetworkManager >= 0.6.2, + PKG_CHECK_MODULES(NETWORKMANAGER_SUPPORT, libnm, [ AC_DEFINE(HAVE_NETWORKMANAGER_SUPPORT, 1, [Define if NetworkManager support is to be included.]) echo "Building with NetworkManager support" diff --git a/src/main.c b/src/main.c index bf3a31eeb..c9590a775 100644 --- a/src/main.c +++ b/src/main.c @@ -152,9 +152,6 @@ static gboolean went_offline_nm; #endif -#if !defined(NM_CHECK_VERSION) -#define NM_CHECK_VERSION(x,y,z) 0 -#endif #ifdef HAVE_DBUS_GLIB static DBusGProxy *awn_proxy = NULL; @@ -1107,17 +1104,10 @@ int main(int argc, char *argv[]) "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager"); if (nm_proxy) { -#if NM_CHECK_VERSION(0,8,992) dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID); dbus_g_proxy_connect_signal(nm_proxy, "StateChanged", G_CALLBACK(networkmanager_state_change_cb), NULL,NULL); -#else - dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID); - dbus_g_proxy_connect_signal(nm_proxy, "StateChange", - G_CALLBACK(networkmanager_state_change_cb), - NULL,NULL); -#endif } #endif install_dbus_status_handler(); @@ -2989,14 +2979,9 @@ gboolean networkmanager_is_online(GError **error) g_propagate_error(error, tmp_error); return TRUE; } -#if NM_CHECK_VERSION(0,8,992) return (state == NM_STATE_CONNECTED_LOCAL || state == NM_STATE_CONNECTED_SITE || state == NM_STATE_CONNECTED_GLOBAL || state == NM_STATE_UNKNOWN); -#else - return (state == NM_STATE_CONNECTED || - state == NM_STATE_UNKNOWN); -#endif } #endif -- 2.25.1