NetworkManager r3575 - in trunk: . libnm-util src/ppp-manager

[dcbw svn gnome org]

Author: dcbw
Date: Fri Apr 18 16:37:35 2008
New Revision: 3575
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3575&view=rev

Log:
2008-04-18  Dan Williams  <dcbw redhat com>

	* libnm-util/nm-setting-ppp.c
	  libnm-util/nm-setting-ppp.h
	  src/ppp-manager/nm-ppp-manager.c
		- Remove the 'require-mppc' option, because pppd doesn't support it and
			it seems to have been an erroneous addition to the PPTP plugin in
			the first place (from which the ppp-manager is derived)



Modified:
   trunk/ChangeLog
   trunk/libnm-util/nm-setting-ppp.c
   trunk/libnm-util/nm-setting-ppp.h
   trunk/src/ppp-manager/nm-ppp-manager.c

Modified: trunk/libnm-util/nm-setting-ppp.c
==============================================================================
--- trunk/libnm-util/nm-setting-ppp.c	(original)
+++ trunk/libnm-util/nm-setting-ppp.c	Fri Apr 18 16:37:35 2008
@@ -15,7 +15,6 @@
 	PROP_REQUIRE_MPPE,
 	PROP_REQUIRE_MPPE_128,
 	PROP_MPPE_STATEFUL,
-	PROP_REQUIRE_MPPC,
 	PROP_CRTSCTS,
 	PROP_USEPEERDNS,
 	PROP_BAUD,
@@ -82,9 +81,6 @@
 	case PROP_MPPE_STATEFUL:
 		setting->mppe_stateful = g_value_get_boolean (value);
 		break;
-	case PROP_REQUIRE_MPPC:
-		setting->require_mppc = g_value_get_boolean (value);
-		break;
 	case PROP_CRTSCTS:
 		setting->crtscts = g_value_get_boolean (value);
 		break;
@@ -146,9 +142,6 @@
 	case PROP_MPPE_STATEFUL:
 		g_value_set_boolean (value, setting->mppe_stateful);
 		break;
-	case PROP_REQUIRE_MPPC:
-		g_value_set_boolean (value, setting->require_mppc);
-		break;
 	case PROP_CRTSCTS:
 		g_value_set_boolean (value, setting->crtscts);
 		break;
@@ -261,14 +254,6 @@
 						   G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 
 	g_object_class_install_property
-		(object_class, PROP_REQUIRE_MPPC,
-		 g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPC,
-						   "Require MPPC",
-						   "Require MPPC",
-						   FALSE,
-						   G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
-
-	g_object_class_install_property
 		(object_class, PROP_CRTSCTS,
 		 g_param_spec_boolean (NM_SETTING_PPP_CRTSCTS,
 						   "CRTSCTS",

Modified: trunk/libnm-util/nm-setting-ppp.h
==============================================================================
--- trunk/libnm-util/nm-setting-ppp.h	(original)
+++ trunk/libnm-util/nm-setting-ppp.h	Fri Apr 18 16:37:35 2008
@@ -25,7 +25,6 @@
 #define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 #define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 #define NM_SETTING_PPP_MPPE_STATEFUL     "mpppe-stateful"
-#define NM_SETTING_PPP_REQUIRE_MPPC      "require-mppc"
 #define NM_SETTING_PPP_CRTSCTS           "crtscts"
 #define NM_SETTING_PPP_USEPEERDNS        "usepeerdns"
 #define NM_SETTING_PPP_BAUD              "baud"
@@ -46,7 +45,6 @@
 	gboolean require_mppe;
 	gboolean require_mppe_128;
 	gboolean mppe_stateful;
-	gboolean require_mppc;
 	gboolean crtscts;
 	gboolean usepeerdns;
 

Modified: trunk/src/ppp-manager/nm-ppp-manager.c
==============================================================================
--- trunk/src/ppp-manager/nm-ppp-manager.c	(original)
+++ trunk/src/ppp-manager/nm-ppp-manager.c	Fri Apr 18 16:37:35 2008
@@ -541,8 +541,6 @@
 		nm_cmd_line_add_string (cmd, "require-mppe-128");
 	if (setting->mppe_stateful)
 		nm_cmd_line_add_string (cmd, "mppe-stateful");
-	if (setting->require_mppc)
-		nm_cmd_line_add_string (cmd, "require-mppc");
 	if (setting->crtscts)
 		nm_cmd_line_add_string (cmd, "crtscts");
 	if (setting->usepeerdns)