mirror
/
network-manager-wireguard-upstream
mirror of https://github.com/max-moser/network-manager-wireguard.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #22 from Druco/nm-gtk-devel_missing 

Nm gtk devel missing
pull/26/head
Max 2018-11-27 23:47:47 +01:00 committed by GitHub
parent 48618efe36 41e4873cc5
commit ca4c5b2935
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -194,14 +194,12 @@ properties_libnm_wireguard_properties_core_la_CPPFLAGS = \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
$(properties_cppflags) \ $(properties_cppflags) \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(LIBNM_GLIB_CFLAGS) \ $(LIBNM_GLIB_CFLAGS)
$(LIBNM_GTK_CFLAGS)
properties_libnm_wireguard_properties_core_la_LIBADD = \ properties_libnm_wireguard_properties_core_la_LIBADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(LIBNM_GLIB_LIBS) \ $(LIBNM_GLIB_LIBS)
$(LIBNM_GTK_LIBS)
if WITH_LIBNM_GLIB if WITH_LIBNM_GLIB

1
configure.ac
View File

@ -102,7 +102,6 @@ if test x"$with_gnome" != xno; then
PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18) PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18)
if test x"$with_libnm_glib" != xno; then if test x"$with_libnm_glib" != xno; then
PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.7.0)
PKG_CHECK_MODULES(LIBNM_GLIB, PKG_CHECK_MODULES(LIBNM_GLIB,
NetworkManager >= 1.7.0 NetworkManager >= 1.7.0
libnm-util >= 1.7.0 libnm-util >= 1.7.0

6
shared/import-export.c
View File

@ -1230,11 +1230,13 @@ create_config_string (NMConnection *connection, GError **error)
args_write_line(f, value); args_write_line(f, value);
g_free(value); g_free(value);
if(listen_port){ if(listen_port){
args_write_line(f, NMV_WG_TAG_LISTEN_PORT, "=", listen_port); args_write_line(f, NMV_WG_TAG_LISTEN_PORT, "=", listen_port);
} }
if(dns){
args_write_line(f,NMV_WG_TAG_DNS, "=", dns);
}
if(post_up){ if(post_up){
args_write_line(f, NMV_WG_TAG_POST_UP, "=", post_up); args_write_line(f, NMV_WG_TAG_POST_UP, "=", post_up);
} }

14
shared/nm-default.h
View File

@ -106,18 +106,4 @@
#endif /* NM_VPN_OLD */ #endif /* NM_VPN_OLD */
/*****************************************************************************/
#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR
#ifdef NM_VPN_OLD
#include <nm-ui-utils.h>
#else /* NM_VPN_OLD */
#include <nma-ui-utils.h>
#endif /* NM_VPN_OLD */
#endif /* NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR */
/*****************************************************************************/
#endif /* __NM_DEFAULT_H__ */ #endif /* __NM_DEFAULT_H__ */