Warnings fixed (by andrew.lukoshko)

properties/ipsec-dialog.c

@@ -81,9 +81,6 @@ handle_enable_changed (GtkWidget *check, gboolean is_init, GtkBuilder *builder)
 {
 	GtkWidget *widget;
 	gboolean enabledp;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gboolean valid;
 
 	enabledp = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
 
@@ -171,9 +168,6 @@ ipsec_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error)
 	GHashTable *hash;
 	GtkWidget *widget;
 	GtkBuilder *builder;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gboolean valid;
 
 	g_return_val_if_fail (dialog != NULL, NULL);
 	if (error)

properties/nm-l2tp.c

@@ -222,7 +222,7 @@ advanced_button_clicked_cb (GtkWidget *button, gpointer user_data)
 	L2tpPluginUiWidget *self = L2TP_PLUGIN_UI_WIDGET (user_data);
 	L2tpPluginUiWidgetPrivate *priv = L2TP_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
 	GtkWidget *dialog;
-	GtkWindow *toplevel;
+	GtkWidget *toplevel;
 
 	toplevel = gtk_widget_get_toplevel (priv->widget);
 	g_return_if_fail (gtk_widget_is_toplevel (toplevel));
@@ -252,7 +252,7 @@ ipsec_button_clicked_cb (GtkWidget *button, gpointer user_data)
 	L2tpPluginUiWidget *self = L2TP_PLUGIN_UI_WIDGET (user_data);
 	L2tpPluginUiWidgetPrivate *priv = L2TP_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
 	GtkWidget *dialog;
-	GtkWindow *toplevel;
+	GtkWidget *toplevel;
 
 	toplevel = gtk_widget_get_toplevel (priv->widget);
 	g_return_if_fail (gtk_widget_is_toplevel (toplevel));
@@ -488,40 +488,6 @@ hash_copy_pair (gpointer key, gpointer data, gpointer user_data)
 	nm_setting_vpn_add_data_item (s_vpn, (const char *) key, (const char *) data);
 }
 
-static void
-save_password_and_flags (NMSettingVPN *s_vpn,
-                         GtkBuilder *builder,
-                         const char *entry_name,
-                         const char *combo_name,
-                         const char *secret_key)
-{
-	NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
-	const char *password;
-	GtkWidget *entry;
-	GtkWidget *combo;
-
-	/* Grab original password flags */
-	entry = GTK_WIDGET (gtk_builder_get_object (builder, entry_name));
-	flags = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (entry), "flags"));
-
-	/* And set new ones based on the type combo */
-	combo = GTK_WIDGET (gtk_builder_get_object (builder, combo_name));
-	switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combo))) {
-	case PW_TYPE_SAVE:
-		password = gtk_entry_get_text (GTK_ENTRY (entry));
-		if (password && strlen (password))
-			nm_setting_vpn_add_secret (s_vpn, secret_key, password);
-		break;
-	case PW_TYPE_UNUSED:
-		flags |= NM_SETTING_SECRET_FLAG_NOT_REQUIRED;
-		break;
-	case PW_TYPE_ASK:
-	default:
-		flags |= NM_SETTING_SECRET_FLAG_NOT_SAVED;
-		break;
-	}
-}
-
 static gboolean
 update_connection (NMVpnPluginUiWidgetInterface *iface,
                    NMConnection *connection,
@@ -611,8 +577,6 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
 	NMVpnPluginUiWidgetInterface *object;
 	L2tpPluginUiWidgetPrivate *priv;
 	char *ui_file;
-	gboolean new = TRUE;
-	NMSettingVPN *s_vpn;
 
 	if (error)
 		g_return_val_if_fail (*error == NULL, NULL);

src/nm-l2tp-service.c

@@ -973,12 +973,12 @@ nm_l2tp_start_ipsec(NML2tpPlugin *plugin,
                             NMSettingVPN *s_vpn,
                             GError **error)
 {
-	NML2tpPluginPrivate *priv = NM_L2TP_PLUGIN_GET_PRIVATE (plugin);
 	const char *ipsec_binary;
 	const char *value;
 	char tmp_secrets[128];
 	char cmd1[4096],cmd11[4096],cmd2[4096];
 	char session_name[128];
+	guint sys=0;
 	FILE *fp;
 
 	if (!(ipsec_binary=nm_find_ipsec())) {
@@ -991,11 +991,11 @@ nm_l2tp_start_ipsec(NML2tpPlugin *plugin,
 	}
 	sprintf(session_name, "nm-ipsec-l2tpd-%d", getpid());
 
-	(void)system(". /var/run/pluto/ipsec.info;"
+	sys += system(". /var/run/pluto/ipsec.info;"
 	"PATH=/usr/local/sbin:/usr/sbin:/sbin; export PATH;"
 	"[ \"x$defaultrouteaddr\" = \"x\" ] && ipsec setup restart");
 
-	(void)system("PATH=/usr/local/sbin:/usr/sbin:/sbin ipsec "
+	sys += system("PATH=/usr/local/sbin:/usr/sbin:/sbin ipsec "
 			" --listen");
 	sprintf(cmd1,". /var/run/pluto/ipsec.info;"
 	"PATH=/usr/local/sbin:/usr/sbin:/sbin ipsec addconn "
@@ -1028,7 +1028,7 @@ nm_l2tp_start_ipsec(NML2tpPlugin *plugin,
 	}
 
 	if(!(fp=fopen("/etc/ipsec.secrets","w"))) {
-		(void)rename(tmp_secrets, "/etc/ipsec.secrets");
+		rename(tmp_secrets, "/etc/ipsec.secrets");
 		g_set_error (error,
 		             NM_VPN_PLUGIN_ERROR,
 		             NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,
@@ -1047,14 +1047,21 @@ nm_l2tp_start_ipsec(NML2tpPlugin *plugin,
 	fprintf(fp, ": PSK \"%s\"\n",value);
 	fclose(fp);
 
-	(void)system("PATH=\"/sbin:/usr/sbin:/usr/local/sbin:$PATH\" ipsec secrets");
-	(void)system(cmd11);
-	(void)system(cmd1);
-	(void)system(cmd2);
-
-	(void)rename(tmp_secrets, "/etc/ipsec.secrets");
-	(void)system("PATH=\"/sbin:/usr/sbin:/usr/local/sbin:$PATH\" ipsec secrets");
+	sys += system("PATH=\"/sbin:/usr/sbin:/usr/local/sbin:$PATH\" ipsec secrets");
+	sys += system(cmd11);
+	sys += system(cmd1);
+	sys += system(cmd2);
 
+	rename(tmp_secrets, "/etc/ipsec.secrets");
+	sys += system("PATH=\"/sbin:/usr/sbin:/usr/local/sbin:$PATH\" ipsec secrets");
+	if (sys != 0) {
+		g_set_error (error,
+		             NM_VPN_PLUGIN_ERROR,
+		             NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,
+		             "%s",
+		             _("Possible error in IPSec setup."));
+		return FALSE;
+	}
 	g_message(_("ipsec ready for action"));
 	return TRUE;
 }
@@ -1153,7 +1160,6 @@ nm_l2tp_config_write (NML2tpPlugin *plugin,
 	char *filename;
 	pid_t pid = getpid ();
 	const char *value;
-	const char *username;
 	gint conf_fd = -1;
 	gint ipsec_fd = -1;
 	gint pppopt_fd = -1;