[network-manager-applet: 3/6] connection-editor: allow IP4 "Disabled" method for more types
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet: 3/6] connection-editor: allow IP4 "Disabled" method for more types
- Date: Fri, 25 Jul 2014 15:51:19 +0000 (UTC)
commit ae4b9f33df62fa3214d04b70ff006f32f2d0ac04
Author: Dan Winship <danw gnome org>
Date: Fri Jul 25 08:41:11 2014 -0400
connection-editor: allow IP4 "Disabled" method for more types
Allow disabling IPv4 on any type that supports IPv6.
src/connection-editor/page-ip4.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index e35e8ac..2e909c3 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -45,6 +45,7 @@
#include "page-ip4.h"
#include "ip4-routes-dialog.h"
+#include "connection-helpers.h"
G_DEFINE_TYPE (CEPageIP4, ce_page_ip4, CE_TYPE_PAGE)
@@ -189,9 +190,8 @@ ip4_private_init (CEPageIP4 *self, NMConnection *connection)
-1);
}
- /* At the moment, Disabled is only supported for Ethernet & Wi-Fi */
- if ( priv->connection_type == NM_TYPE_SETTING_WIRED
- || priv->connection_type == NM_TYPE_SETTING_WIRELESS) {
+ /* Disabled is only supported for types that also support IPv6 */
+ if (connection_supports_ip6 (connection)) {
gtk_list_store_append (priv->method_store, &iter);
gtk_list_store_set (priv->method_store, &iter,
METHOD_COL_NAME, _("Disabled"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]