[network-manager-applet: 5/6] editor: remove "(PPP)" from WWAN addressing modes



commit a5e16733640465502bed43e55a2e0fc605f41822
Author: Dan Williams <dcbw redhat com>
Date:   Fri Jul 25 09:34:58 2014 -0500

    editor: remove "(PPP)" from WWAN addressing modes
    
    Most WWAN devices don't use PPP for addressing these days.

 src/connection-editor/page-ip4.c |    4 ++--
 src/connection-editor/page-ip6.c |    4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index 2e909c3..fe1a575 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -135,8 +135,8 @@ ip4_private_init (CEPageIP4 *self, NMConnection *connection)
                str_auto_only = _("Automatic (VPN) addresses only");
        } else if (   priv->connection_type == NM_TYPE_SETTING_GSM
                   || priv->connection_type == NM_TYPE_SETTING_CDMA) {
-               str_auto = _("Automatic (PPP)");
-               str_auto_only = _("Automatic (PPP) addresses only");
+               str_auto = _("Automatic");
+               str_auto_only = _("Automatic, addresses only");
        } else if (priv->connection_type == NM_TYPE_SETTING_PPPOE) {
                str_auto = _("Automatic (PPPoE)");
                str_auto_only = _("Automatic (PPPoE) addresses only");
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index 7dfea80..5796441 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -139,10 +139,6 @@ ip6_private_init (CEPageIP6 *self, NMConnection *connection)
        if (priv->connection_type == NM_TYPE_SETTING_VPN) {
                str_auto = _("Automatic (VPN)");
                str_auto_only = _("Automatic (VPN) addresses only");
-       } else if (   priv->connection_type == NM_TYPE_SETTING_GSM
-                  || priv->connection_type == NM_TYPE_SETTING_CDMA) {
-               str_auto = _("Automatic (PPP)");
-               str_auto_only = _("Automatic (PPP) addresses only");
        } else if (priv->connection_type == NM_TYPE_SETTING_PPPOE) {
                str_auto = _("Automatic (PPPoE)");
                str_auto_only = _("Automatic (PPPoE) addresses only");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]