diff options
| author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2019-05-28 00:18:55 -0400 |
|---|---|---|
| committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2019-05-28 00:18:55 -0400 |
| commit | 9c79ca6cc69ba295f3c3548743999dde9abafe28 (patch) | |
| tree | 6aec173c6c06b153a01252499c8432d6e6efd54d | |
| parent | e0f00d364ba8eae60abfad6eaaee1f3414687b1d (diff) | |
| download | pidgin-9c79ca6cc69ba295f3c3548743999dde9abafe28.tar.gz | |
Fix build against NetworkManager 1.0+.
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | libpurple/network.c | 5 |
2 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 2ac444d76c..0cd3404d9b 100644 --- a/configure.ac +++ b/configure.ac @@ -1428,18 +1428,24 @@ fi dnl Check for NetworkManager.h; if we don't have it, oh well if test "x$enable_dbus" = "xyes" ; then if test "x$enable_nm" = "xyes" ; then - PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [ + PKG_CHECK_MODULES(NETWORKMANAGER, [libnm], [ AC_SUBST(NETWORKMANAGER_CFLAGS) AC_SUBST(NETWORKMANAGER_LIBS) AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) ], [ - enable_nm=no - if test "x$force_deps" = "xyes" ; then - AC_MSG_ERROR([ + PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [ + AC_SUBST(NETWORKMANAGER_CFLAGS) + AC_SUBST(NETWORKMANAGER_LIBS) + AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) + ], [ + enable_nm=no + if test "x$force_deps" = "xyes" ; then + AC_MSG_ERROR([ NetworkManager development headers not found. Use --disable-nm if you do not need NetworkManager support. ]) - fi]) + fi]) + ]) fi else enable_nm=no diff --git a/libpurple/network.c b/libpurple/network.c index c43e3c7e36..b17e4390aa 100644 --- a/libpurple/network.c +++ b/libpurple/network.c @@ -939,8 +939,13 @@ nm_update_state(NMState state) #if NM_CHECK_VERSION(0,8,992) case NM_STATE_DISCONNECTING: #endif +#if NM_CHECK_VERSION(1,0,0) + if (prev != NM_STATE_CONNECTED_GLOBAL && prev != NM_STATE_UNKNOWN) + break; +#else if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) break; +#endif if (ui_ops != NULL && ui_ops->network_disconnected != NULL) ui_ops->network_disconnected(); break; |