Imported Upstream version 1.1.91 upstream/1.1.91

13 files changed, 20 insertions, 19 deletions

diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
index 3e442c30..e3d655d0 100644
--- a/examples/C/glib/Makefile.am
+++ b/examples/C/glib/Makefile.am
@@ -5,7 +5,8 @@ AM_CPPFLAGS = \
 	-I${top_builddir}/libnm-core \
 	-I${top_srcdir}/libnm \
 	-I${top_builddir}/libnm \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
 
 noinst_PROGRAMS = \
 	add-connection-gdbus \
diff --git a/examples/C/glib/Makefile.in b/examples/C/glib/Makefile.in
index c755d178..782318fc 100644
--- a/examples/C/glib/Makefile.in
+++ b/examples/C/glib/Makefile.in
@@ -500,7 +500,8 @@ AM_CPPFLAGS = \
 	-I${top_builddir}/libnm-core \
 	-I${top_srcdir}/libnm \
 	-I${top_builddir}/libnm \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
 
 add_connection_gdbus_SOURCES = add-connection-gdbus.c
 add_connection_gdbus_LDADD = \
diff --git a/examples/C/glib/add-connection-gdbus.c b/examples/C/glib/add-connection-gdbus.c
index d3903273..7a4d5939 100644
--- a/examples/C/glib/add-connection-gdbus.c
+++ b/examples/C/glib/add-connection-gdbus.c
@@ -27,8 +27,6 @@
  *   gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` -luuid add-connection-gdbus.c -o add-connection-gdbus
  */
 
-#include "config.h"
-
 #include <gio/gio.h>
 #include <uuid/uuid.h>
 #include <NetworkManager.h>
diff --git a/examples/C/glib/add-connection-libnm.c b/examples/C/glib/add-connection-libnm.c
index 75048bd8..f206340e 100644
--- a/examples/C/glib/add-connection-libnm.c
+++ b/examples/C/glib/add-connection-libnm.c
@@ -27,8 +27,6 @@
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` add-connection-libnm.c -o add-connection-libnm
  */
 
-#include "config.h"
-
 #include <glib.h>
 #include <NetworkManager.h>
 
diff --git a/examples/C/glib/get-active-connections-gdbus.c b/examples/C/glib/get-active-connections-gdbus.c
index 9b34f6b2..6a19bf89 100644
--- a/examples/C/glib/get-active-connections-gdbus.c
+++ b/examples/C/glib/get-active-connections-gdbus.c
@@ -26,8 +26,6 @@
  *   gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` get-active-connections-gdbus.c -o get-active-connections-gdbus
  */
 
-#include "config.h"
-
 #include <string.h>
 #include <gio/gio.h>
 #include <NetworkManager.h>
diff --git a/examples/C/glib/get-ap-info-libnm.c b/examples/C/glib/get-ap-info-libnm.c
index 90bc2d5e..5868c279 100644
--- a/examples/C/glib/get-ap-info-libnm.c
+++ b/examples/C/glib/get-ap-info-libnm.c
@@ -25,8 +25,6 @@
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` get-ap-info-libnm.c -o get-ap-info-libnm
  */
 
-#include "config.h"
-
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/examples/C/glib/list-connections-gdbus.c b/examples/C/glib/list-connections-gdbus.c
index 634bd90c..f5922582 100644
--- a/examples/C/glib/list-connections-gdbus.c
+++ b/examples/C/glib/list-connections-gdbus.c
@@ -27,8 +27,6 @@
  *   gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` list-connections-gdbus.c -o list-connections-gdbus
  */
 
-#include "config.h"
-
 #include <gio/gio.h>
 #include <NetworkManager.h>
 
diff --git a/examples/C/glib/list-connections-libnm.c b/examples/C/glib/list-connections-libnm.c
index d5cdf361..f09c028b 100644
--- a/examples/C/glib/list-connections-libnm.c
+++ b/examples/C/glib/list-connections-libnm.c
@@ -26,8 +26,6 @@
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` list-connections-libnm.c -o list-connections-libnm
  */
 
-#include "config.h"
-
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/examples/C/glib/monitor-nm-running-gdbus.c b/examples/C/glib/monitor-nm-running-gdbus.c
index e4b3bbbf..2e1a11c0 100644
--- a/examples/C/glib/monitor-nm-running-gdbus.c
+++ b/examples/C/glib/monitor-nm-running-gdbus.c
@@ -28,8 +28,6 @@
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` monitor-nm-running-gdbus.c -o monitor-nm-running-gdbus
  */
 
-#include "config.h"
-
 #include <gio/gio.h>
 
 static void
diff --git a/examples/C/glib/monitor-nm-state-gdbus.c b/examples/C/glib/monitor-nm-state-gdbus.c
index aeabcfe1..05596399 100644
--- a/examples/C/glib/monitor-nm-state-gdbus.c
+++ b/examples/C/glib/monitor-nm-state-gdbus.c
@@ -29,8 +29,6 @@
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` `pkg-config --cflags libnm` monitor-nm-state-gdbus.c -o monitor-nm-state-gdbus
  */
 
-#include "config.h"
-
 #include <gio/gio.h>
 #include <string.h>
 #include <nm-dbus-interface.h>
diff --git a/examples/python/dbus/list-devices.py b/examples/python/dbus/list-devices.py
index b8e0058b..8dd41f61 100755
--- a/examples/python/dbus/list-devices.py
+++ b/examples/python/dbus/list-devices.py
@@ -36,6 +36,11 @@ devtypes = { 1: "Ethernet",
              13: "Bridge",
              14: "Generic",
              15: "Team"
+             16: "TUN"
+             17: "IPTunnel"
+             18: "MACVLAN"
+             19: "VXLAN"
+             20: "Veth"
            }
 
 states = { 0: "Unknown",
diff --git a/examples/ruby/list-devices.rb b/examples/ruby/list-devices.rb
index 710ccedc..bf374258 100755
--- a/examples/ruby/list-devices.rb
+++ b/examples/ruby/list-devices.rb
@@ -38,7 +38,12 @@ devtypes = { 1 => "Ethernet",
              12 => "ADSL",
              13 => "Bridge",
              14 => "Generic",
-             15 => "Team"
+             15 => "Team",
+             16 => "TUN",
+             17 => "IPTunnel",
+             18 => "MACVLAN",
+             19 => "VXLAN",
+             20 => "Veth",
            }
 
 states = { 0   => "Unknown",
diff --git a/examples/shell/list-devices.sh b/examples/shell/list-devices.sh
index dba82261..c5c41140 100755
--- a/examples/shell/list-devices.sh
+++ b/examples/shell/list-devices.sh
@@ -48,6 +48,11 @@ devtype_to_name()
    13) echo "Bridge" ;;
    14) echo "Generic" ;;
    15) echo "Team" ;;
+   16) echo "TUN" ;;
+   17) echo "IPTunnel" ;;
+   18) echo "MACVLAN" ;;
+   19) echo "VXLAN" ;;
+   20) echo "Veth" ;;
     *) echo "Unknown" ;;
   esac
 }