replace NM_L2TP_KEY_USE_ACCOMP to NM_L2TP_KEY_NO_ACCOMP for consistency (may...

replace NM_L2TP_KEY_USE_ACCOMP to NM_L2TP_KEY_NO_ACCOMP for consistency (may require user to re-save his ppp options)

properties/advanced-dialog.c

@@ -67,7 +67,7 @@ static const char *advanced_keys[] = {
 	NM_L2TP_KEY_NODEFLATE,
 	NM_L2TP_KEY_NO_VJ_COMP,
 	NM_L2TP_KEY_NO_PCOMP,
-	NM_L2TP_KEY_USE_ACCOMP,
+	NM_L2TP_KEY_NO_ACCOMP,
 	NM_L2TP_KEY_LCP_ECHO_FAILURE,
 	NM_L2TP_KEY_LCP_ECHO_INTERVAL,
 	NULL
@@ -483,9 +483,10 @@ advanced_dialog_new (GHashTable *hash)
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_useaccomp"));
-	value = g_hash_table_lookup (hash, NM_L2TP_KEY_USE_ACCOMP);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+	value = g_hash_table_lookup (hash, NM_L2TP_KEY_NO_ACCOMP);
 	if (value && !strcmp (value, "yes"))
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_send_echo_packets"));
 	value = g_hash_table_lookup (hash, NM_L2TP_KEY_LCP_ECHO_INTERVAL);
@@ -550,24 +551,24 @@ advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error)
 	}
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_allow_bsdcomp"));
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) /* negate */
 		g_hash_table_insert (hash, g_strdup (NM_L2TP_KEY_NOBSDCOMP), g_strdup ("yes"));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_allow_deflate"));
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) /* negate */
 		g_hash_table_insert (hash, g_strdup (NM_L2TP_KEY_NODEFLATE), g_strdup ("yes"));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_usevj"));
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) /* negate */
 		g_hash_table_insert (hash, g_strdup (NM_L2TP_KEY_NO_VJ_COMP), g_strdup ("yes"));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder,"ppp_usepcomp"));
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) /* negate */
 		g_hash_table_insert (hash, g_strdup (NM_L2TP_KEY_NO_PCOMP), g_strdup ("yes"));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_useaccomp"));
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
-		g_hash_table_insert (hash, g_strdup (NM_L2TP_KEY_USE_ACCOMP), g_strdup ("yes"));
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) /* negate */
+		g_hash_table_insert (hash, g_strdup (NM_L2TP_KEY_NO_ACCOMP), g_strdup ("yes"));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_send_echo_packets"));
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) {

src/nm-l2tp-service.c

@@ -413,7 +413,7 @@ static ValidProperty valid_properties[] = {
 	{ NM_L2TP_KEY_NODEFLATE,         G_TYPE_BOOLEAN, FALSE },
 	{ NM_L2TP_KEY_NO_VJ_COMP,        G_TYPE_BOOLEAN, FALSE },
 	{ NM_L2TP_KEY_NO_PCOMP,          G_TYPE_BOOLEAN, FALSE },
-	{ NM_L2TP_KEY_USE_ACCOMP,        G_TYPE_BOOLEAN, FALSE },
+	{ NM_L2TP_KEY_NO_ACCOMP,         G_TYPE_BOOLEAN, FALSE },
 	{ NM_L2TP_KEY_LCP_ECHO_FAILURE,  G_TYPE_UINT, FALSE },
 	{ NM_L2TP_KEY_LCP_ECHO_INTERVAL, G_TYPE_UINT, FALSE },
 	{ NM_L2TP_KEY_PASSWORD"-flags",  G_TYPE_UINT, FALSE },
@@ -1141,7 +1141,7 @@ static PPPOpt ppp_options[] = {
 	{NM_L2TP_KEY_NODEFLATE, G_TYPE_BOOLEAN, "nodeflate\n"},
 	{NM_L2TP_KEY_NO_VJ_COMP, G_TYPE_BOOLEAN, "novj\n"},
 	{NM_L2TP_KEY_NO_PCOMP, G_TYPE_BOOLEAN, "nopcomp\n"},
-	/* negate {NM_L2TP_KEY_USE_ACCOMP, G_TYPE_BOOLEAN, "noaccomp\n"}, */
+	{NM_L2TP_KEY_NO_ACCOMP, G_TYPE_BOOLEAN, "noaccomp\n"},
 	{NULL, G_TYPE_NONE, NULL}
 };
 
@@ -1285,10 +1285,6 @@ nm_l2tp_config_write (NML2tpPlugin *plugin,
 			write_config_option (pppopt_fd, ppp_options[i].write_to_config);
 	}
 
-	value = nm_setting_vpn_get_data_item (s_vpn, NM_L2TP_KEY_USE_ACCOMP);
-	if (!(value && !strcmp (value, "yes")))
-		write_config_option (pppopt_fd, "noaccomp\n");
-
 	value = nm_setting_vpn_get_data_item (s_vpn, NM_L2TP_KEY_LCP_ECHO_FAILURE);
 	if (value && strlen (value)) {
 		long int tmp_int;

src/nm-l2tp-service.h

@@ -64,7 +64,7 @@
 #define NM_L2TP_KEY_NODEFLATE         "nodeflate"
 #define NM_L2TP_KEY_NO_VJ_COMP        "no-vj-comp"
 #define NM_L2TP_KEY_NO_PCOMP          "nopcomp"
-#define NM_L2TP_KEY_USE_ACCOMP        "accomp"
+#define NM_L2TP_KEY_NO_ACCOMP         "noaccomp"
 #define NM_L2TP_KEY_LCP_ECHO_FAILURE  "lcp-echo-failure"
 #define NM_L2TP_KEY_LCP_ECHO_INTERVAL "lcp-echo-interval"