Imported Upstream version 1.1.90 upstream/1.1.90

author: Michael Biebl <biebl@debian.org> 2016-01-20 16:26:51 +0100
committer: Michael Biebl <biebl@debian.org> 2016-01-20 16:26:51 +0100
commit: 494f296a3baab08522617b24b1f126d8f9a17502 (patch)
tree: c8ef32fb0dd1c4ff35a0b38e787abb58692de0cd /clients/tui
parent: 54f6333410ffd570e62717d9e77c5c987175e397 (diff)
48 files changed, 67 insertions, 123 deletions
diff --git a/clients/tui/Makefile.am b/clients/tui/Makefile.am
index a84fcdff..caf792ee 100644
--- a/clients/tui/Makefile.am
+++ b/clients/tui/Makefile.am
@@ -4,8 +4,8 @@ SUBDIRS = newt .
 
 AM_CPPFLAGS= \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
 	-I$(top_srcdir)/libnm-core \
 	-I$(top_builddir)/libnm-core \
 	-I$(top_srcdir)/libnm \
@@ -18,8 +18,6 @@ AM_CPPFLAGS= \
 	-DG_LOG_DOMAIN=\""nmtui"\" \
 	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	-DLOCALEDIR=\""$(localedir)"\" \
-	-DNMCONFDIR=\"$(nmconfdir)\" \
-	-DNMLIBDIR=\"$(libdir)\" \
 	$(NULL)
 
 bin_PROGRAMS = nmtui
@@ -27,12 +25,12 @@ links = nmtui-edit nmtui-connect nmtui-hostname
 
 install-exec-hook:
 	for link in $(links); do \
-		ln -f $(DESTDIR)$(bindir)/nmtui $(DESTDIR)$(bindir)/$$link; \
+		$(LN_S) -f nmtui "$(DESTDIR)$(bindir)/$$link"; \
 	done
 
 uninstall-hook:
 	for link in $(links); do \
-		rm -f $(DESTDIR)$(bindir)/$$link; \
+		rm -f "$(DESTDIR)$(bindir)/$$link"; \
 	done
 
 nmtui_SOURCES = \
diff --git a/clients/tui/Makefile.in b/clients/tui/Makefile.in
index 866ae462..f489995d 100644
--- a/clients/tui/Makefile.in
+++ b/clients/tui/Makefile.in
@@ -311,7 +311,6 @@ BLUEZ5_LIBS = @BLUEZ5_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CKDB_PATH = @CKDB_PATH@
 CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
 CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
 CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
@@ -323,8 +322,6 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_GLIB_100_CFLAGS = @DBUS_GLIB_100_CFLAGS@
-DBUS_GLIB_100_LIBS = @DBUS_GLIB_100_LIBS@
 DBUS_LIBS = @DBUS_LIBS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
@@ -334,6 +331,7 @@ DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
 DNSMASQ_PATH = @DNSMASQ_PATH@
+DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -388,16 +386,13 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
+LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
 LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -434,6 +429,8 @@ NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
+NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@
+NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
@@ -462,7 +459,6 @@ POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
 PPPD_PATH = @PPPD_PATH@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-PPPOE_PATH = @PPPOE_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
@@ -477,6 +473,8 @@ SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
 SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_JOURNAL_CFLAGS = @SYSTEMD_JOURNAL_CFLAGS@
+SYSTEMD_JOURNAL_LIBS = @SYSTEMD_JOURNAL_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
 SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
@@ -537,6 +535,7 @@ mkdir_p = @mkdir_p@
 nmbinary = @nmbinary@
 nmconfdir = @nmconfdir@
 nmdatadir = @nmdatadir@
+nmlibdir = @nmlibdir@
 nmrundir = @nmrundir@
 nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
@@ -544,6 +543,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -562,8 +562,8 @@ with_valgrind = @with_valgrind@
 @BUILD_NMTUI_TRUE@SUBDIRS = newt .
 @BUILD_NMTUI_TRUE@AM_CPPFLAGS = \
 @BUILD_NMTUI_TRUE@	-I$(top_srcdir) \
-@BUILD_NMTUI_TRUE@	-I$(top_srcdir)/include \
-@BUILD_NMTUI_TRUE@	-I$(top_builddir)/include \
+@BUILD_NMTUI_TRUE@	-I$(top_srcdir)/shared \
+@BUILD_NMTUI_TRUE@	-I$(top_builddir)/shared \
 @BUILD_NMTUI_TRUE@	-I$(top_srcdir)/libnm-core \
 @BUILD_NMTUI_TRUE@	-I$(top_builddir)/libnm-core \
 @BUILD_NMTUI_TRUE@	-I$(top_srcdir)/libnm \
@@ -576,8 +576,6 @@ with_valgrind = @with_valgrind@
 @BUILD_NMTUI_TRUE@	-DG_LOG_DOMAIN=\""nmtui"\" \
 @BUILD_NMTUI_TRUE@	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 @BUILD_NMTUI_TRUE@	-DLOCALEDIR=\""$(localedir)"\" \
-@BUILD_NMTUI_TRUE@	-DNMCONFDIR=\"$(nmconfdir)\" \
-@BUILD_NMTUI_TRUE@	-DNMLIBDIR=\"$(libdir)\" \
 @BUILD_NMTUI_TRUE@	$(NULL)
 
 @BUILD_NMTUI_TRUE@links = nmtui-edit nmtui-connect nmtui-hostname
@@ -1156,12 +1154,12 @@ uninstall-am: uninstall-binPROGRAMS
 
 @BUILD_NMTUI_TRUE@install-exec-hook:
 @BUILD_NMTUI_TRUE@	for link in $(links); do \
-@BUILD_NMTUI_TRUE@		ln -f $(DESTDIR)$(bindir)/nmtui $(DESTDIR)$(bindir)/$$link; \
+@BUILD_NMTUI_TRUE@		$(LN_S) -f nmtui "$(DESTDIR)$(bindir)/$$link"; \
 @BUILD_NMTUI_TRUE@	done
 
 @BUILD_NMTUI_TRUE@uninstall-hook:
 @BUILD_NMTUI_TRUE@	for link in $(links); do \
-@BUILD_NMTUI_TRUE@		rm -f $(DESTDIR)$(bindir)/$$link; \
+@BUILD_NMTUI_TRUE@		rm -f "$(DESTDIR)$(bindir)/$$link"; \
 @BUILD_NMTUI_TRUE@	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/clients/tui/newt/Makefile.am b/clients/tui/newt/Makefile.am
index e572238b..e07f9bef 100644
--- a/clients/tui/newt/Makefile.am
+++ b/clients/tui/newt/Makefile.am
@@ -1,5 +1,8 @@
 AM_CPPFLAGS= \
-	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
+	-I$(top_srcdir)/libnm-core \
+	-I$(top_builddir)/libnm-core \
 	-DG_LOG_DOMAIN=\""nmtui"\" \
 	$(GLIB_CFLAGS) \
 	$(NEWT_CFLAGS) \
diff --git a/clients/tui/newt/Makefile.in b/clients/tui/newt/Makefile.in
index ab647863..f1c579cb 100644
--- a/clients/tui/newt/Makefile.in
+++ b/clients/tui/newt/Makefile.in
@@ -212,7 +212,6 @@ BLUEZ5_LIBS = @BLUEZ5_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CKDB_PATH = @CKDB_PATH@
 CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
 CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
 CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
@@ -224,8 +223,6 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_GLIB_100_CFLAGS = @DBUS_GLIB_100_CFLAGS@
-DBUS_GLIB_100_LIBS = @DBUS_GLIB_100_LIBS@
 DBUS_LIBS = @DBUS_LIBS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
@@ -235,6 +232,7 @@ DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
 DNSMASQ_PATH = @DNSMASQ_PATH@
+DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -289,16 +287,13 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
+LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
 LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -335,6 +330,8 @@ NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
+NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@
+NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
@@ -363,7 +360,6 @@ POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
 PPPD_PATH = @PPPD_PATH@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-PPPOE_PATH = @PPPOE_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
@@ -378,6 +374,8 @@ SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
 SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_JOURNAL_CFLAGS = @SYSTEMD_JOURNAL_CFLAGS@
+SYSTEMD_JOURNAL_LIBS = @SYSTEMD_JOURNAL_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
 SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
@@ -438,6 +436,7 @@ mkdir_p = @mkdir_p@
 nmbinary = @nmbinary@
 nmconfdir = @nmconfdir@
 nmdatadir = @nmdatadir@
+nmlibdir = @nmlibdir@
 nmrundir = @nmrundir@
 nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
@@ -445,6 +444,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -461,7 +461,10 @@ with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 with_valgrind = @with_valgrind@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
+	-I$(top_srcdir)/libnm-core \
+	-I$(top_builddir)/libnm-core \
 	-DG_LOG_DOMAIN=\""nmtui"\" \
 	$(GLIB_CFLAGS) \
 	$(NEWT_CFLAGS) \
diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c
index 19bd3998..ce401e25 100644
--- a/clients/tui/newt/nmt-newt-form.c
+++ b/clients/tui/newt/nmt-newt-form.c
@@ -30,8 +30,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-newt-form.h"
 #include "nmt-newt-button.h"
 #include "nmt-newt-grid.h"
diff --git a/clients/tui/newt/nmt-newt-popup.c b/clients/tui/newt/nmt-newt-popup.c
index b604eaaa..f7813063 100644
--- a/clients/tui/newt/nmt-newt-popup.c
+++ b/clients/tui/newt/nmt-newt-popup.c
@@ -28,8 +28,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-newt-popup.h"
 #include "nmt-newt-form.h"
 #include "nmt-newt-hacks.h"
diff --git a/clients/tui/newt/nmt-newt-types.h b/clients/tui/newt/nmt-newt-types.h
index 608f7ff6..4ea0a7b8 100644
--- a/clients/tui/newt/nmt-newt-types.h
+++ b/clients/tui/newt/nmt-newt-types.h
@@ -19,9 +19,9 @@
 #ifndef NMT_NEWT_TYPES_H
 #define NMT_NEWT_TYPES_H
 
-#include <glib-object.h>
 #include <newt.h>
-#include "nm-glib-compat.h"
+
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 
diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
index 70a65a84..841144d8 100644
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/clients/tui/newt/nmt-newt-utils.c
@@ -28,9 +28,7 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
-#include <glib/gi18n-lib.h>
-
-#include "nm-glib-compat.h"
+#include "nm-default.h"
 #include "nmt-newt-utils.h"
 
 static void
diff --git a/clients/tui/newt/nmt-newt-utils.h b/clients/tui/newt/nmt-newt-utils.h
index 3b37868a..706f10d3 100644
--- a/clients/tui/newt/nmt-newt-utils.h
+++ b/clients/tui/newt/nmt-newt-utils.h
@@ -20,7 +20,8 @@
 #define NMT_NEWT_UTILS_H
 
 #include <newt.h>
-#include <glib.h>
+
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 
diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
index 9218c31f..a21ed666 100644
--- a/clients/tui/nm-editor-bindings.c
+++ b/clients/tui/nm-editor-bindings.c
@@ -33,7 +33,6 @@
 #include <string.h>
 
 #include "nm-editor-bindings.h"
-#include "nm-gvaluearray-compat.h"
 
 static void
 value_transform_string_int (const GValue *src_value,
diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c
index fa2a2752..026ef231 100644
--- a/clients/tui/nm-editor-utils.c
+++ b/clients/tui/nm-editor-utils.c
@@ -27,9 +27,9 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
 #include <NetworkManager.h>
 
+#include "nm-default.h"
 #include "nm-editor-utils.h"
 #if 0
 #include "nm-vpn-helpers.h"
@@ -224,7 +224,7 @@ nm_editor_utils_get_connection_type_list (void)
 
 #if 0
 	/* Add "VPN" only if there are plugins */
-	vpn_plugins_hash = nm_vpn_get_plugins (NULL);
+	vpn_plugins_hash = nm_vpn_get_plugins ();
 	have_vpn_plugins  = vpn_plugins_hash && g_hash_table_size (vpn_plugins_hash);
 	if (have_vpn_plugins) {
 		GHashTableIter iter;
diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c
index 42873c52..3faf3442 100644
--- a/clients/tui/nmt-address-list.c
+++ b/clients/tui/nmt-address-list.c
@@ -35,8 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-address-list.h"
 #include "nmt-ip-entry.h"
 
diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c
index 88502ba7..c21cc5be 100644
--- a/clients/tui/nmt-connect-connection-list.c
+++ b/clients/tui/nmt-connect-connection-list.c
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
 
 #include <NetworkManager.h>
 
diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
index 2af5e584..2760b149 100644
--- a/clients/tui/nmt-device-entry.c
+++ b/clients/tui/nmt-device-entry.c
@@ -40,7 +40,6 @@
 #include <sys/socket.h>
 #include <linux/if_arp.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmtui.h"
diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c
index e1b982dd..72e8c706 100644
--- a/clients/tui/nmt-edit-connection-list.c
+++ b/clients/tui/nmt-edit-connection-list.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmtui.h"
 #include "nmtui-edit.h"
 #include "nmt-edit-connection-list.h"
diff --git a/clients/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c
index a46d0ed4..f2afc8c7 100644
--- a/clients/tui/nmt-editor-page.c
+++ b/clients/tui/nmt-editor-page.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-editor-page.h"
 
 G_DEFINE_ABSTRACT_TYPE (NmtEditorPage, nmt_editor_page, G_TYPE_OBJECT)
diff --git a/clients/tui/nmt-editor-section.c b/clients/tui/nmt-editor-section.c
index ff463f7f..b9a3ae83 100644
--- a/clients/tui/nmt-editor-section.c
+++ b/clients/tui/nmt-editor-section.c
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-editor-section.h"
 #include "nmt-newt-toggle-button.h"
 
diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c
index abc92866..aaa73cbe 100644
--- a/clients/tui/nmt-editor.c
+++ b/clients/tui/nmt-editor.c
@@ -27,10 +27,9 @@
 
 #include "nmt-editor.h"
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
 #include <nm-utils.h>
 
+#include "nm-default.h"
 #include "nmtui.h"
 
 #include "nm-editor-utils.h"
diff --git a/clients/tui/nmt-ip-entry.c b/clients/tui/nmt-ip-entry.c
index 30c7e2e4..d31a1f46 100644
--- a/clients/tui/nmt-ip-entry.c
+++ b/clients/tui/nmt-ip-entry.c
@@ -33,8 +33,6 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-ip-entry.h"
 
 G_DEFINE_TYPE (NmtIPEntry, nmt_ip_entry, NMT_TYPE_NEWT_ENTRY)
diff --git a/clients/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h
index 2e3e6cd1..099bacb7 100644
--- a/clients/tui/nmt-mac-entry.h
+++ b/clients/tui/nmt-mac-entry.h
@@ -19,6 +19,7 @@
 #ifndef NMT_MAC_ENTRY_H
 #define NMT_MAC_ENTRY_H
 
+#include "nm-default.h"
 #include "nm-utils.h"
 #include "nmt-newt.h"
 
diff --git a/clients/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c
index f599557a..9f11af0a 100644
--- a/clients/tui/nmt-mtu-entry.c
+++ b/clients/tui/nmt-mtu-entry.c
@@ -34,8 +34,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-mtu-entry.h"
 
 G_DEFINE_TYPE (NmtMtuEntry, nmt_mtu_entry, NMT_TYPE_NEWT_GRID)
diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c
index b043b513..ecc9aefc 100644
--- a/clients/tui/nmt-page-bond.c
+++ b/clients/tui/nmt-page-bond.c
@@ -27,9 +27,7 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-bond.h"
 
 #include "nmt-address-list.h"
diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c
index c9ef14ed..fdf44039 100644
--- a/clients/tui/nmt-page-bridge-port.c
+++ b/clients/tui/nmt-page-bridge-port.c
@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-bridge-port.h"
 
 G_DEFINE_TYPE (NmtPageBridgePort, nmt_page_bridge_port, NMT_TYPE_EDITOR_PAGE)
diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c
index 460be60b..e9b0e66d 100644
--- a/clients/tui/nmt-page-bridge.c
+++ b/clients/tui/nmt-page-bridge.c
@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-bridge.h"
 
 #include "nmt-address-list.h"
@@ -91,6 +89,12 @@ nmt_page_bridge_constructed (GObject *object)
 	label = nmt_newt_label_new (_("seconds"));
 	nmt_editor_grid_append (grid, _("Aging time"), widget, label);
 
+	widget = nmt_newt_checkbox_new (_("Enable IGMP snooping"));
+	g_object_bind_property (s_bridge, NM_SETTING_BRIDGE_MULTICAST_SNOOPING,
+	                        widget, "active",
+	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+	nmt_editor_grid_append (grid, NULL, widget, NULL);
+
 	widget = stp = nmt_newt_checkbox_new (_("Enable STP (Spanning Tree Protocol)"));
 	g_object_bind_property (s_bridge, NM_SETTING_BRIDGE_STP,
 	                        widget, "active",
diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c
index 1d476aa0..2346b496 100644
--- a/clients/tui/nmt-page-dsl.c
+++ b/clients/tui/nmt-page-dsl.c
@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-dsl.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-page-ppp.h"
diff --git a/clients/tui/nmt-page-dsl.h b/clients/tui/nmt-page-dsl.h
index b938ead2..dc84ca07 100644
--- a/clients/tui/nmt-page-dsl.h
+++ b/clients/tui/nmt-page-dsl.h
@@ -19,6 +19,7 @@
 #ifndef NMT_PAGE_DSL_H
 #define NMT_PAGE_DSL_H
 
+#include "nm-default.h"
 #include "nmt-editor-page-device.h"
 
 G_BEGIN_DECLS
diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c
index cf4ef2c4..fed81f1c 100644
--- a/clients/tui/nmt-page-ethernet.c
+++ b/clients/tui/nmt-page-ethernet.c
@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"
diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c
index f39b0b84..e10c5a7a 100644
--- a/clients/tui/nmt-page-infiniband.c
+++ b/clients/tui/nmt-page-infiniband.c
@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-infiniband.h"
 #include "nmt-mtu-entry.h"
 
diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c
index c7009e2f..2cc4f6af 100644
--- a/clients/tui/nmt-page-ip4.c
+++ b/clients/tui/nmt-page-ip4.c
@@ -25,9 +25,7 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-ip4.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"
diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c
index 122c37f6..e547122b 100644
--- a/clients/tui/nmt-page-ip6.c
+++ b/clients/tui/nmt-page-ip6.c
@@ -25,9 +25,7 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-ip6.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"
diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c
index cec36549..662ebd9c 100644
--- a/clients/tui/nmt-page-ppp.c
+++ b/clients/tui/nmt-page-ppp.c
@@ -25,9 +25,7 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-ppp.h"
 #include "nmt-newt-section.h"
 #include "nmt-newt-separator.h"
diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c
index 645dc9d3..797c1cf1 100644
--- a/clients/tui/nmt-page-team-port.c
+++ b/clients/tui/nmt-page-team-port.c
@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-team-port.h"
 
 G_DEFINE_TYPE (NmtPageTeamPort, nmt_page_team_port, NMT_TYPE_EDITOR_PAGE)
diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c
index e520b02a..572941b6 100644
--- a/clients/tui/nmt-page-team.c
+++ b/clients/tui/nmt-page-team.c
@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-team.h"
 
 #include "nmt-slave-list.h"
diff --git a/clients/tui/nmt-page-team.h b/clients/tui/nmt-page-team.h
index 2d8bf07a..994b63d3 100644
--- a/clients/tui/nmt-page-team.h
+++ b/clients/tui/nmt-page-team.h
@@ -19,6 +19,7 @@
 #ifndef NMT_PAGE_TEAM_H
 #define NMT_PAGE_TEAM_H
 
+#include "nm-default.h"
 #include "nmt-editor-page-device.h"
 
 G_BEGIN_DECLS
diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c
index 9b9c8f52..d392c552 100644
--- a/clients/tui/nmt-page-vlan.c
+++ b/clients/tui/nmt-page-vlan.c
@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nm-editor-bindings.h"
 
 #include "nmt-page-vlan.h"
diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c
index 9cd20abf..c4b085ea 100644
--- a/clients/tui/nmt-page-wifi.c
+++ b/clients/tui/nmt-page-wifi.c
@@ -29,9 +29,7 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-page-wifi.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"
diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c
index bf29dcf5..8eca7dc0 100644
--- a/clients/tui/nmt-password-dialog.c
+++ b/clients/tui/nmt-password-dialog.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-password-dialog.h"
 #include "nm-secret-agent-simple.h"
 #include "nmtui.h"
diff --git a/clients/tui/nmt-password-fields.c b/clients/tui/nmt-password-fields.c
index 7ef037b9..cba64935 100644
--- a/clients/tui/nmt-password-fields.c
+++ b/clients/tui/nmt-password-fields.c
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-password-fields.h"
 
 G_DEFINE_TYPE (NmtPasswordFields, nmt_password_fields, NMT_TYPE_NEWT_GRID)
diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c
index 77bbec76..dc4d118b 100644
--- a/clients/tui/nmt-route-editor.c
+++ b/clients/tui/nmt-route-editor.c
@@ -27,9 +27,7 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
+#include "nm-default.h"
 #include "nmt-route-editor.h"
 #include "nmt-route-table.h"
 
diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c
index 3a875520..1cc99940 100644
--- a/clients/tui/nmt-route-entry.c
+++ b/clients/tui/nmt-route-entry.c
@@ -32,7 +32,6 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmt-route-entry.h"
diff --git a/clients/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c
index 523d8ee3..0731acb6 100644
--- a/clients/tui/nmt-route-table.c
+++ b/clients/tui/nmt-route-table.c
@@ -30,7 +30,6 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmt-route-table.h"
diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c
index 9c8596f7..5a9b7482 100644
--- a/clients/tui/nmt-slave-list.c
+++ b/clients/tui/nmt-slave-list.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmt-slave-list.h"
diff --git a/clients/tui/nmt-utils.h b/clients/tui/nmt-utils.h
index 7e24fcab..5531dbeb 100644
--- a/clients/tui/nmt-utils.h
+++ b/clients/tui/nmt-utils.h
@@ -19,7 +19,7 @@
 #ifndef NMT_UTILS_H
 #define NMT_UTILS_H
 
-#include <glib-object.h>
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 
diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c
index 9159ed98..b314e146 100644
--- a/clients/tui/nmt-widget-list.c
+++ b/clients/tui/nmt-widget-list.c
@@ -37,8 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-widget-list.h"
 #include "nmt-newt.h"
 
diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c
index 9838b6fd..9d705bf1 100644
--- a/clients/tui/nmtui-connect.c
+++ b/clients/tui/nmtui-connect.c
@@ -28,10 +28,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
-#include "gsystem-local-alloc.h"
-
 #include "nmt-newt.h"
 
 #include "nmtui.h"
diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c
index 0c3206da..258b798a 100644
--- a/clients/tui/nmtui-edit.c
+++ b/clients/tui/nmtui-edit.c
@@ -27,7 +27,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
 #include <NetworkManager.h>
 
 #include "nmtui.h"
diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c
index 23de95b8..f77a918b 100644
--- a/clients/tui/nmtui-hostname.c
+++ b/clients/tui/nmtui-hostname.c
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-
 #include "nmt-newt.h"
 
 #include "nmtui.h"
diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index 0fac98eb..20e7d02b 100644
--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@@ -30,11 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
 #include <NetworkManager.h>
 
+#include "nm-default.h"
 #include "nmt-newt.h"
 #include "nm-editor-bindings.h"
author	Michael Biebl <biebl@debian.org>	2016-01-20 16:26:51 +0100
committer	Michael Biebl <biebl@debian.org>	2016-01-20 16:26:51 +0100
commit	494f296a3baab08522617b24b1f126d8f9a17502 (patch)
tree	c8ef32fb0dd1c4ff35a0b38e787abb58692de0cd /clients/tui
parent	54f6333410ffd570e62717d9e77c5c987175e397 (diff)