Fix bug 3895: Port from libnm-util/libnm-glib to libnm

diff --git a/configure.ac b/configure.ac
index 58c63ace4455bd190f9958040152f1d9f583a276..35e3b139ecf375f9f148e52c003f1018895699bf 100644 (file)
--- 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 bf3a31eeb379345de9b6134aa10abdec8c8a320c..c9590a7754147c7fa6f50047719e506a6f0b71b0 100644 (file)
--- 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