Global: New name, more fixes

.gitignore

@@ -27,11 +27,11 @@ m4/intltool.m4
 m4/libtool.m4
 m4/lt*.m4
 
-auth-dialog/nm-l2tp-auth-dialog
-nm-l2tp-service.name
-nm-l2tp.desktop
-src/nm-l2tp-pppd-service-glue.h
-src/nm-l2tp-service
+auth-dialog/nm-ipsec-l2tp-auth-dialog
+nm-ipsec-l2tp-service.name
+nm-ipsec-l2tp.desktop
+src/nm-ipsec-l2tp-pppd-service-glue.h
+src/nm-ipsec-l2tp-service
 
 .autotools
 .cproject

AUTHORS

+Ismail Khatib <ikhatib@gmail.com>
+
+Based on NetworkManager-l2tp by:
 Alexey Torkhov <atorkhov@gmail.com>
 Sergey Prokhorov <me@seriyps.ru>
-Ismail Khatib <ikhatib@gmail.com>
 
 Based on NetworkManager-pptp by:
 Antony Mee <eemynotna@gmail.com>

Makefile.am

@@ -7,13 +7,13 @@ SUBDIRS += auth-dialog properties po
 endif
 
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
-dbusservice_DATA = nm-l2tp-service.conf
+dbusservice_DATA = nm-ipsec-l2tp-service.conf
 
 nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
-nmvpnservice_DATA = nm-l2tp-service.name
+nmvpnservice_DATA = nm-ipsec-l2tp-service.name
 
-desktopfile = nm-l2tp.desktop.in
-iconfile = gnome-mime-application-x-l2tp-settings.png
+desktopfile = nm-ipsec-l2tp.desktop.in
+iconfile = gnome-mime-application-x-ipsec-l2tp-settings.png
 
 if WITH_GNOME
 # FIXME: uncomment when nmce gets --import support
@@ -26,19 +26,19 @@ if WITH_GNOME
 #icon_DATA = $(iconfile)
 endif
 
-nm-l2tp-service.name: $(srcdir)/nm-l2tp-service.name.in
+nm-ipsec-l2tp-service.name: $(srcdir)/nm-ipsec-l2tp-service.name.in
 	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
 	    -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
 	    $< >$@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
 
-EXTRA_DIST = nm-l2tp-service.name.in \
-             $(dbusservice_DATA)  \
+EXTRA_DIST = nm-ipsec-l2tp-service.name.in \
+             $(dbusservice_DATA) \
              $(desktopfile) \
              $(iconfile) \
-             intltool-extract.in  \
-             intltool-merge.in    \
+             intltool-extract.in \
+             intltool-merge.in \
              intltool-update.in
 
 CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~

README

-L2TP support for NetworkManager
-===============================
-
-This version has IPSEC support and can connect to a Sonicwall
+IPSec-L2TP support for NetworkManager
+=====================================
 
 Uses xl2tpd and (optional) openswan.
 
@@ -13,4 +11,19 @@ Build
     make
     sudo make install
 
-Ubuntu users see README.ubuntu file.
\ No newline at end of file
+Debian and Ubuntu
+=================
+
+The Debian and Ubuntu GNOME packages don't have reasonable defaults,
+so you have to give ./configure every path manually.
+
+  ./configure \
+	--prefix=/usr --localstatedir=/etc --sysconfdir=/etc \
+	--sharedstatedir=/var/lib --libexecdir=/usr/lib/NetworkManager \
+	--infodir=/usr/share/info --mandir=/usr/share/man \
+	--with-pppd-plugin-dir=/usr/lib/pppd/2.4.5 \
+	--with-dist-version=<my_build_ver>
+
+You'll need at least the following installed:
+
+  sudo apt-get install xl2tpd openswan

README.ubuntu

-
-The Debian and Ubuntu GNOME packages don't have reasonable defaults,
-so you have to give ./configure every path manually.
-
-  ./configure \
-	--prefix=/usr --localstatedir=/etc --sysconfdir=/etc \
-	--sharedstatedir=/var/lib --libexecdir=/usr/lib/NetworkManager \
-	--infodir=/usr/share/info --mandir=/usr/share/man \
-	--with-pppd-plugin-dir=/usr/lib/pppd/2.4.5 \
-	--with-dist-version=<my_build_ver>
-
-You'll need at least the following installed:
-
-  sudo apt-get install xl2tpd openswan
-

auth-dialog/Makefile.am

 INCLUDES = -I${top_srcdir}
 
-libexec_PROGRAMS = nm-l2tp-auth-dialog
+libexec_PROGRAMS = nm-ipsec-l2tp-auth-dialog
 
-nm_l2tp_auth_dialog_CPPFLAGS =			\
-	$(NM_CFLAGS)		\
-	$(GLIB_CFLAGS)			\
+nm_ipsec_l2tp_auth_dialog_CPPFLAGS =		\
+	$(NM_CFLAGS)				\
+	$(GLIB_CFLAGS)				\
 	$(GTK_CFLAGS)				\
 	$(GNOMEKEYRING_CFLAGS)			\
 	-DICONDIR=\""$(datadir)/pixmaps"\"	\
@@ -13,14 +13,14 @@ nm_l2tp_auth_dialog_CPPFLAGS =			\
 	-DG_DISABLE_DEPRECATED			\
 	-DVERSION=\"$(VERSION)\"
 
-nm_l2tp_auth_dialog_SOURCES =			\
-	main.c \
-	vpn-password-dialog.c \
+nm_ipsec_l2tp_auth_dialog_SOURCES =		\
+	main.c					\
+	vpn-password-dialog.c			\
 	vpn-password-dialog.h
 
-nm_l2tp_auth_dialog_LDADD =			\
-	$(NM_LIBS) \
-	$(GTK_LIBS) \
+nm_ipsec_l2tp_auth_dialog_LDADD =		\
+	$(NM_LIBS)				\
+	$(GTK_LIBS)				\
 	$(GNOMEKEYRING_LIBS)
 
 CLEANFILES = *~

auth-dialog/main.c

@@ -36,7 +36,7 @@
 #include <nm-setting-vpn.h>
 #include <nm-vpn-plugin-utils.h>
 
-#include "src/nm-l2tp-service.h"
+#include <src/nm-ipsec-l2tp-service.h>
 #include "vpn-password-dialog.h"
 
 #define KEYRING_UUID_TAG "connection-uuid"
@@ -126,7 +126,7 @@ get_secrets (const char *vpn_uuid,
 		if (in_pw)
 			pw = gnome_keyring_memory_strdup (in_pw);
 		else
-			pw = keyring_lookup_secret (vpn_uuid, NM_L2TP_KEY_PASSWORD);
+			pw = keyring_lookup_secret (vpn_uuid, NM_IPSEC_L2TP_KEY_PASSWORD);
 	}
 
 	/* Don't ask if the passwords is unused */
@@ -149,7 +149,7 @@ get_secrets (const char *vpn_uuid,
 		g_key_file_set_string (keyfile, UI_KEYFILE_GROUP, "Description", prompt);
 		g_key_file_set_string (keyfile, UI_KEYFILE_GROUP, "Title", _("Authenticate VPN"));
 
-		keyfile_add_entry_info (keyfile, NM_L2TP_KEY_PASSWORD, pw ? pw : "", _("Password:"), TRUE, allow_interaction);
+		keyfile_add_entry_info (keyfile, NM_IPSEC_L2TP_KEY_PASSWORD, pw ? pw : "", _("Password:"), TRUE, allow_interaction);
 
 		keyfile_print_stdout (keyfile);
 		g_key_file_unref (keyfile);
@@ -242,7 +242,7 @@ main (int argc, char *argv[])
 
 	gtk_init (&argc, &argv);
 
-	context = g_option_context_new ("- l2tp auth dialog");
+	context = g_option_context_new ("- ipsec-l2tp auth dialog");
 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
 	g_option_context_parse (context, &argc, &argv, NULL);
 	g_option_context_free (context);
@@ -252,8 +252,8 @@ main (int argc, char *argv[])
 		return 1;
 	}
 
-	if (strcmp (vpn_service, NM_DBUS_SERVICE_L2TP) != 0) {
-		fprintf (stderr, "This dialog only works with the '%s' service\n", NM_DBUS_SERVICE_L2TP);
+	if (strcmp (vpn_service, NM_DBUS_SERVICE_IPSEC_L2TP) != 0) {
+		fprintf (stderr, "This dialog only works with the '%s' service\n", NM_DBUS_SERVICE_IPSEC_L2TP);
 		return 1;
 	}
 
@@ -263,10 +263,10 @@ main (int argc, char *argv[])
 		return 1;
 	}
 
-	nm_vpn_plugin_utils_get_secret_flags (secrets, NM_L2TP_KEY_PASSWORD, &pw_flags);
+	nm_vpn_plugin_utils_get_secret_flags (secrets, NM_IPSEC_L2TP_KEY_PASSWORD, &pw_flags);
 
 	if (!get_secrets (vpn_uuid, vpn_name, retry, allow_interaction, external_ui_mode,
-	                  g_hash_table_lookup (secrets, NM_L2TP_KEY_PASSWORD),
+	                  g_hash_table_lookup (secrets, NM_IPSEC_L2TP_KEY_PASSWORD),
 	                  &password,
 	                  pw_flags))
 		return 1;
@@ -274,7 +274,7 @@ main (int argc, char *argv[])
 	if (!external_ui_mode) {
 		/* dump the passwords to stdout */
 		if (password)
-			printf ("%s\n%s\n", NM_L2TP_KEY_PASSWORD, password);
+			printf ("%s\n%s\n", NM_IPSEC_L2TP_KEY_PASSWORD, password);
 		printf ("\n\n");
 
 		gnome_keyring_memory_free (password);

autogen.sh

@@ -4,7 +4,7 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 REQUIRED_AUTOMAKE_VERSION=1.9
-PKG_NAME=NetworkManager-l2tp
+PKG_NAME=NetworkManager-ipsec-l2tp
 
 (test -f $srcdir/configure.ac \
   && test -f $srcdir/auth-dialog/main.c) || {

configure.ac

 AC_PREREQ(2.59)
 
-AC_INIT(NetworkManager-l2tp, 0.9.8.5, root@seriyps.ru, NetworkManager-l2tp)
+AC_INIT(NetworkManager-ipsec-l2tp, 0.0.1.0, ikhatib@gmail.com, NetworkManager-ipsec-l2tp)
 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 subdir-objects])
 AM_MAINTAINER_MODE
 
@@ -51,10 +51,10 @@ AC_CHECK_FUNCS(select socket uname)
 dnl
 dnl GNOME support
 dnl
-AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-l2tp without GNOME support, e.g. vpn service only]))
+AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-ipsec-l2tp without GNOME support, e.g. vpn service only]))
 AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
 
-GETTEXT_PACKAGE=NetworkManager-l2tp
+GETTEXT_PACKAGE=NetworkManager-ipsec-l2tp
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 

nm-l2tp-service.conf → nm-ipsec-l2tp-service.conf

@@ -3,18 +3,17 @@
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
 	<policy user="root">
-		<allow own="org.freedesktop.NetworkManager.l2tp"/>
-		<allow send_destination="org.freedesktop.NetworkManager.l2tp"/>
+		<allow own="org.freedesktop.NetworkManager.ipsec-l2tp"/>
+		<allow send_destination="org.freedesktop.NetworkManager.ipsec-l2tp"/>
 
-		<allow own="org.freedesktop.NetworkManager.l2tp-ppp"/>
-		<allow send_destination="org.freedesktop.NetworkManager.l2tp-ppp"/>
+		<allow own="org.freedesktop.NetworkManager.ipsec-l2tp-ppp"/>
+		<allow send_destination="org.freedesktop.NetworkManager.ipsec-l2tp-ppp"/>
 	</policy>
 	<policy context="default">
-		<deny own="org.freedesktop.NetworkManager.l2tp"/>
-		<deny send_destination="org.freedesktop.NetworkManager.l2tp"/>
+		<deny own="org.freedesktop.NetworkManager.ipsec-l2tp"/>
+		<deny send_destination="org.freedesktop.NetworkManager.ipsec-l2tp"/>
 
-		<deny own="org.freedesktop.NetworkManager.l2tp-ppp"/>
-		<deny send_destination="org.freedesktop.NetworkManager.l2tp-ppp"/>
+		<deny own="org.freedesktop.NetworkManager.ipsec-l2tp-ppp"/>
+		<deny send_destination="org.freedesktop.NetworkManager.ipsec-l2tp-ppp"/>
 	</policy>
 </busconfig>
-

nm-ipsec-l2tp-service.name.in

+[VPN Connection]
+name=ipsec-l2tp
+service=org.freedesktop.NetworkManager.ipsec-l2tp
+program=@LIBEXECDIR@/nm-ipsec-l2tp-service
+
+[GNOME]
+auth-dialog=@LIBEXECDIR@/nm-ipsec-l2tp-auth-dialog
+properties=@PLUGINDIR@/libnm-ipsec-l2tp-properties
+supports-external-ui-mode=true

nm-l2tp.desktop.in → nm-ipsec-l2tp.desktop.in

 [Desktop Entry]
-_Name=L2TP VPN Connection Manager
-_GenericName=L2TP VPN Connection Manager
-_Comment=Add, Remove, and Edit L2TP VPN Connections
-Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.l2tp --import-file %f
-Icon=gnome-mime-application-x-l2tp-settings
+_Name=IPSec-L2TP VPN Connection Manager
+_GenericName=IPSec-L2TP VPN Connection Manager
+_Comment=Add, Remove, and Edit IPSec-L2TP VPN Connections
+Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.ipsec-l2tp --import-file %f
+Icon=gnome-mime-application-x-ipsec-l2tp-settings
 Terminal=false
 Type=Application
 Categories=GNOME;Network;

nm-l2tp-service.name.in

-[VPN Connection]
-name=l2tp
-service=org.freedesktop.NetworkManager.l2tp
-program=@LIBEXECDIR@/nm-l2tp-service
-
-[GNOME]
-auth-dialog=@LIBEXECDIR@/nm-l2tp-auth-dialog
-properties=@PLUGINDIR@/libnm-l2tp-properties
-supports-external-ui-mode=true

po/POTFILES.in

@@ -2,10 +2,10 @@
 # Please keep this file sorted alphabetically.
 auth-dialog/main.c
 auth-dialog/vpn-password-dialog.c
-nm-l2tp.desktop.in
+nm-ipsec-l2tp.desktop.in
 properties/advanced-dialog.c
 properties/import-export.c
 properties/ipsec-dialog.c
-properties/nm-l2tp.c
-[type: gettext/glade]properties/nm-l2tp-dialog.ui
-src/nm-l2tp-service.c
+properties/nm-ipsec-l2tp.c
+[type: gettext/glade]properties/nm-ipsec-l2tp-dialog.ui
+src/nm-ipsec-l2tp-service.c

properties/Makefile.am

 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-l2tp-properties.la
+plugin_LTLIBRARIES = libnm-ipsec-l2tp-properties.la
 
 INCLUDES = -I${top_srcdir}
 
-libnm_l2tp_properties_la_SOURCES = \
-	nm-l2tp.c \
-	nm-l2tp.h \
+libnm_ipsec_l2tp_properties_la_SOURCES = \
+	nm-ipsec-l2tp.c \
+	nm-ipsec-l2tp.h \
 	ipsec-dialog.c \
 	ipsec-dialog.h \
 	advanced-dialog.c \
@@ -14,9 +14,9 @@ libnm_l2tp_properties_la_SOURCES = \
 	import-export.h
 
 uidir = $(datadir)/gnome-vpn-properties/l2tp
-ui_DATA = nm-l2tp-dialog.ui
+ui_DATA = nm-ipsec-l2tp-dialog.ui
 
-libnm_l2tp_properties_la_CFLAGS =                    \
+libnm_ipsec_l2tp_properties_la_CFLAGS =			\
         $(GLIB_CFLAGS)                                  \
         $(GTK_CFLAGS)                                   \
         $(NM_CFLAGS)                                    \
@@ -26,14 +26,14 @@ libnm_l2tp_properties_la_CFLAGS =                    \
         -DG_DISABLE_DEPRECATED                          \
         -DVERSION=\"$(VERSION)\"
 
-libnm_l2tp_properties_la_LIBADD = \
+libnm_ipsec_l2tp_properties_la_LIBADD = \
         $(GTK_LIBS) \
         $(NM_LIBS)
 
-libnm_l2tp_properties_la_LDFLAGS =   \
+libnm_ipsec_l2tp_properties_la_LDFLAGS = \
         -avoid-version
 
 CLEANFILES = *.bak *~
 
-EXTRA_DIST =                            \
+EXTRA_DIST = \
         $(ui_DATA)

properties/ipsec-dialog.c

@@ -38,16 +38,16 @@
 #include <nm-setting-vpn.h>
 
 #include "ipsec-dialog.h"
-#include "nm-l2tp.h"
-#include "../src/nm-l2tp-service.h"
+#include "nm-ipsec-l2tp.h"
+#include "../src/nm-ipsec-l2tp-service.h"
 
 static const char *ipsec_keys[] = {
-	NM_L2TP_KEY_IPSEC_ENABLE,
-	NM_L2TP_KEY_IPSEC_GROUP_NAME,
-	NM_L2TP_KEY_IPSEC_GATEWAY_ID,
-	NM_L2TP_KEY_IPSEC_PSK,
-	NM_L2TP_KEY_IPSEC_RSA,
-	NM_L2TP_KEY_IPSEC_RSA_PW,
+	NM_IPSEC_L2TP_KEY_IPSEC_ENABLE,
+	NM_IPSEC_L2TP_KEY_IPSEC_GROUP_NAME,
+	NM_IPSEC_L2TP_KEY_IPSEC_GATEWAY_ID,
+	NM_IPSEC_L2TP_KEY_IPSEC_PSK,
+	NM_IPSEC_L2TP_KEY_IPSEC_RSA,
+	NM_IPSEC_L2TP_KEY_IPSEC_RSA_PW,
 	NULL
 };
 
@@ -120,7 +120,7 @@ ipsec_dialog_new (GHashTable *hash)
 
 	g_return_val_if_fail (hash != NULL, NULL);
 
-	ui_file = g_strdup_printf ("%s/%s", UIDIR, "nm-l2tp-dialog.ui");
+	ui_file = g_strdup_printf ("%s/%s", UIDIR, "nm-ipsec-l2tp-dialog.ui");
 	builder = gtk_builder_new ();
 
 	if (!gtk_builder_add_from_file(builder, ui_file, &error)) {
@@ -133,7 +133,7 @@ ipsec_dialog_new (GHashTable *hash)
 	gtk_builder_set_translation_domain(builder, GETTEXT_PACKAGE);
 
 
-	dialog = GTK_WIDGET (gtk_builder_get_object (builder, "l2tp-ipsec-dialog"));
+	dialog = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec-l2tp-ipsec-dialog"));
 	if (!dialog) {
 		g_object_unref (G_OBJECT (builder));
 		goto out;
@@ -143,31 +143,31 @@ ipsec_dialog_new (GHashTable *hash)
 	g_object_set_data_full (G_OBJECT (dialog), "gtkbuilder-xml",
 			builder, (GDestroyNotify) g_object_unref);
 
-	value = g_hash_table_lookup (hash, NM_L2TP_KEY_IPSEC_ENABLE);
+	value = g_hash_table_lookup (hash, NM_IPSEC_L2TP_KEY_IPSEC_ENABLE);
 	if (value && !strcmp (value, "yes")) {
 		widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_enable"));
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
 	}
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_group_name"));
-	value = g_hash_table_lookup (hash, NM_L2TP_KEY_IPSEC_GROUP_NAME);
+	value = g_hash_table_lookup (hash, NM_IPSEC_L2TP_KEY_IPSEC_GROUP_NAME);
 	if (!value) value="";
 	gtk_entry_set_text(GTK_ENTRY(widget), value);
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_gateway_id"));
-	if((value = g_hash_table_lookup (hash, NM_L2TP_KEY_IPSEC_GATEWAY_ID)))
+	if((value = g_hash_table_lookup (hash, NM_IPSEC_L2TP_KEY_IPSEC_GATEWAY_ID)))
 		gtk_entry_set_text(GTK_ENTRY(widget), value);
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_psk"));
-	if((value = g_hash_table_lookup (hash, NM_L2TP_KEY_IPSEC_PSK)))
+	if((value = g_hash_table_lookup (hash, NM_IPSEC_L2TP_KEY_IPSEC_PSK)))
 		gtk_entry_set_text(GTK_ENTRY(widget), value);
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_rsa"));
-	if((value = g_hash_table_lookup (hash, NM_L2TP_KEY_IPSEC_RSA)))
+	if((value = g_hash_table_lookup (hash, NM_IPSEC_L2TP_KEY_IPSEC_RSA)))
 		gtk_entry_set_text(GTK_ENTRY(widget), value);
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_rsa_pw"));
-	if((value = g_hash_table_lookup (hash, NM_L2TP_KEY_IPSEC_RSA_PW)))
+	if((value = g_hash_table_lookup (hash, NM_IPSEC_L2TP_KEY_IPSEC_RSA_PW)))
 		gtk_entry_set_text(GTK_ENTRY(widget), value);
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder,"ipsec_enable"));
@@ -198,26 +198,26 @@ ipsec_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error)
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_enable"));
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
-		g_hash_table_insert(hash, g_strdup(NM_L2TP_KEY_IPSEC_ENABLE), g_strdup("yes"));
+		g_hash_table_insert(hash, g_strdup(NM_IPSEC_L2TP_KEY_IPSEC_ENABLE), g_strdup("yes"));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_gateway_id"));
-	g_hash_table_insert(hash, g_strdup(NM_L2TP_KEY_IPSEC_GATEWAY_ID),
+	g_hash_table_insert(hash, g_strdup(NM_IPSEC_L2TP_KEY_IPSEC_GATEWAY_ID),
 			g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_group_name"));
-	g_hash_table_insert(hash, g_strdup(NM_L2TP_KEY_IPSEC_GROUP_NAME),
+	g_hash_table_insert(hash, g_strdup(NM_IPSEC_L2TP_KEY_IPSEC_GROUP_NAME),
 			g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_psk"));
-	g_hash_table_insert(hash, g_strdup(NM_L2TP_KEY_IPSEC_PSK),
+	g_hash_table_insert(hash, g_strdup(NM_IPSEC_L2TP_KEY_IPSEC_PSK),
 			g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_rsa"));
-	g_hash_table_insert(hash, g_strdup(NM_L2TP_KEY_IPSEC_RSA),
+	g_hash_table_insert(hash, g_strdup(NM_IPSEC_L2TP_KEY_IPSEC_RSA),
 			g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ipsec_rsa_pw"));
-	g_hash_table_insert(hash, g_strdup(NM_L2TP_KEY_IPSEC_RSA_PW),
+	g_hash_table_insert(hash, g_strdup(NM_IPSEC_L2TP_KEY_IPSEC_RSA_PW),
 			g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))));
 
 	return hash;

properties/nm-l2tp-dialog.ui → properties/nm-ipsec-l2tp-dialog.ui

 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
-  <object class="GtkDialog" id="l2tp-advanced-dialog">
+  <object class="GtkDialog" id="ipsec-l2tp-advanced-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">L2TP PPP Options</property>
+    <property name="title" translatable="yes">IPSec-L2TP PPP Options</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">stock-preferences</property>
@@ -461,10 +461,10 @@ config: lcp-echo-failure and lcp-echo-interval</property>
       <action-widget response="-5">ok_button1</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkDialog" id="l2tp-ipsec-dialog">
+  <object class="GtkDialog" id="ipsec-l2tp-ipsec-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">L2TP IPSEC Options</property>
+    <property name="title" translatable="yes">IPSec-L2TP IPSec Options</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
@@ -696,7 +696,7 @@ config: lcp-echo-failure and lcp-echo-interval</property>
       <action-widget response="-5">ipsec_ok_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkVBox" id="l2tp-vbox">
+  <object class="GtkVBox" id="ipsec-l2tp-vbox">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">12</property>

src/nm-l2tp-pppd-service.xml → src/nm-ipsec-l2tp-pppd-service.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 
 <node name="/">
-  <interface name="org.freedesktop.NetworkManager.l2tp.ppp">
+  <interface name="org.freedesktop.NetworkManager.ipsec-l2tp.ppp">
     <method name="NeedSecrets">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_l2tp_service_need_secrets"/>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ipsec_l2tp_service_need_secrets"/>
       <arg name="username" type="s" direction="out"/>
       <arg name="password" type="s" direction="out"/>
     </method>
 
     <method name="SetIp4Config">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_l2tp_service_set_ip4_config"/>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ipsec_l2tp_service_set_ip4_config"/>
       <arg name="config" type="a{sv}" direction="in"/>
     </method>
 
     <method name="SetState">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_l2tp_service_set_state"/>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ipsec_l2tp_service_set_state"/>
       <arg name="state" type="u" direction="in"/>
     </method>
   </interface>

src/nm-ppp-status.h

 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* nm-l2tp-service - L2TP VPN integration with NetworkManager
+/* nm-ipsec-l2tp-service - IPSec-L2TP VPN integration with NetworkManager
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by