Fix locales paths (port from pptp); version 0.9.8.4

Makefile.am

@@ -28,7 +28,7 @@ endif
 
 nm-l2tp-service.name: $(srcdir)/nm-l2tp-service.name.in
 	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-	    -e 's|[@]LIBDIR[@]|$(libdir)|g' \
+	    -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
 	    $< >$@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes

configure.ac

 AC_PREREQ(2.59)
 
-AC_INIT(NetworkManager-l2tp, 0.9.8.0, root@seriyps.ru, NetworkManager-l2tp)
+AC_INIT(NetworkManager-l2tp, 0.9.8.4, root@seriyps.ru, NetworkManager-l2tp)
 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 subdir-objects])
 AM_MAINTAINER_MODE
 
@@ -71,10 +71,10 @@ AC_SUBST(DBUS_GLIB_CFLAGS)
 AC_SUBST(DBUS_GLIB_LIBS)
 
 PKG_CHECK_MODULES(NM,
-                  NetworkManager >= 0.9.6
-                  libnm-util >= 0.9.6
-                  libnm-glib >= 0.9.6
-                  libnm-glib-vpn >= 0.9.6)
+                  NetworkManager >= 0.9.8
+                  libnm-util >= 0.9.8
+                  libnm-glib >= 0.9.8
+                  libnm-glib-vpn >= 0.9.8)
 AC_SUBST(NM_CFLAGS)
 AC_SUBST(NM_LIBS)
 

nm-l2tp-service.name.in

@@ -5,5 +5,5 @@ program=@LIBEXECDIR@/nm-l2tp-service
 
 [GNOME]
 auth-dialog=@LIBEXECDIR@/nm-l2tp-auth-dialog
-properties=@LIBDIR@/libnm-l2tp-properties
+properties=@PLUGINDIR@/libnm-pptp-properties
 supports-external-ui-mode=true

properties/Makefile.am

@@ -20,6 +20,7 @@ libnm_l2tp_properties_la_CFLAGS =                    \
         $(NM_CFLAGS)                        \
         -DICONDIR=\""$(datadir)/pixmaps"\"              \
         -DUIDIR=\""$(uidir)"\"                          \
+        -DLOCALEDIR=\""$(datadir)/locale"\"             \
         -DG_DISABLE_DEPRECATED                          \
         -DVERSION=\"$(VERSION)\"
 

properties/nm-l2tp.c

@@ -894,6 +894,9 @@ nm_vpn_plugin_ui_factory (GError **error)
 	if (error)
 		g_return_val_if_fail (*error == NULL, NULL);
 
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
 	return NM_VPN_PLUGIN_UI_INTERFACE (g_object_new (L2TP_TYPE_PLUGIN_UI, NULL));
 }