[gnome-control-center] network: Remove HAVE_NM_UNSTABLE check
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] network: Remove HAVE_NM_UNSTABLE check
- Date: Thu, 26 May 2016 12:53:10 +0000 (UTC)
commit da96effab73302de878ee70093cae088770e288a
Author: Bastien Nocera <hadess hadess net>
Date: Fri Apr 29 14:15:16 2016 +0200
network: Remove HAVE_NM_UNSTABLE check
We don't have any code that relies on it anymore.
https://bugzilla.gnome.org/show_bug.cgi?id=747443
configure.ac | 7 -------
panels/network/cc-network-panel.c | 2 --
2 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cc17a4b..7bb613d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,13 +213,6 @@ if test x${have_networkmanager} = xyes; then
AC_SUBST(NM_VPN_MODULE_DIR)
fi
-# Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769
-PKG_CHECK_MODULES(NM_UNSTABLE_CHECK, libnm-util >= 0.9.9.0, nm_unstable=yes, nm_unstable=no)
-if test x$nm_unstable = xyes; then
- AC_DEFINE(HAVE_NM_UNSTABLE, 1, [Define to 1 if NetworkManager is available])
-fi
-AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
-
# Check for gnome-bluetooth
PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2,
[have_bluetooth=yes], have_bluetooth=no)
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 17e3cbf..7c3b250 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -1220,11 +1220,9 @@ add_connection (CcNetworkPanel *panel,
if (g_strcmp0 (type, "vpn") != 0 && iface == NULL)
return;
-#ifdef HAVE_NM_UNSTABLE
/* Don't add the libvirtd bridge to the UI */
if (g_strcmp0 (nm_setting_connection_get_interface_name (s_con), "virbr0") == 0)
return;
-#endif
g_debug ("add %s/%s remote connection: %s",
type, g_type_name_from_instance ((GTypeInstance*)connection),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]