Imported Upstream version 1.0.0 upstream/1.0.0

13 files changed, 579 insertions, 99 deletions

diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 03015579..3cf08733 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -1,40 +1,127 @@
+noinst_LTLIBRARIES = \
+	libnmdbus.la
+
+# gdbus-codegen 2.38 will emit code that requires glib 2.38, which
+# will then cause availability warnings if we define
+# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32.
+#
+# This is fixed in GLib 2.40 (it emits code that takes
+# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go
+# away when we depend on that.
+AM_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS))
+
+nodist_libnmdbus_la_SOURCES = \
+	nmdbus-access-point.c \
+	nmdbus-access-point.h \
+	nmdbus-active-connection.c \
+	nmdbus-active-connection.h \
+	nmdbus-agent-manager.c \
+	nmdbus-agent-manager.h \
+	nmdbus-device-bond.c \
+	nmdbus-device-bond.h \
+	nmdbus-device-bridge.c \
+	nmdbus-device-bridge.h \
+	nmdbus-device-bt.c \
+	nmdbus-device-bt.h \
+	nmdbus-device-ethernet.c \
+	nmdbus-device-ethernet.h \
+	nmdbus-device.c \
+	nmdbus-device.h \
+	nmdbus-device-generic.c \
+	nmdbus-device-generic.h \
+	nmdbus-device-gre.c \
+	nmdbus-device-gre.h \
+	nmdbus-device-infiniband.c \
+	nmdbus-device-infiniband.h \
+	nmdbus-device-macvlan.c \
+	nmdbus-device-macvlan.h \
+	nmdbus-device-tun.c \
+	nmdbus-device-tun.h \
+	nmdbus-device-veth.c \
+	nmdbus-device-veth.h \
+	nmdbus-device-vlan.c \
+	nmdbus-device-vlan.h \
+	nmdbus-device-vxlan.c \
+	nmdbus-device-vxlan.h \
+	nmdbus-device-wifi.c \
+	nmdbus-device-wifi.h \
+	nmdbus-device-wimax.c \
+	nmdbus-device-wimax.h \
+	nmdbus-dhcp4-config.c \
+	nmdbus-dhcp4-config.h \
+	nmdbus-dhcp6-config.c \
+	nmdbus-dhcp6-config.h \
+	nmdbus-ip4-config.c \
+	nmdbus-ip4-config.h \
+	nmdbus-ip6-config.c \
+	nmdbus-ip6-config.h \
+	nmdbus-manager.c \
+	nmdbus-manager.h \
+	nmdbus-ppp-manager.c \
+	nmdbus-ppp-manager.h \
+	nmdbus-secret-agent.c \
+	nmdbus-secret-agent.h \
+	nmdbus-settings-connection.c \
+	nmdbus-settings-connection.h \
+	nmdbus-settings.c \
+	nmdbus-settings.h \
+	nmdbus-vpn-connection.c \
+	nmdbus-vpn-connection.h \
+	nmdbus-vpn-plugin.c \
+	nmdbus-vpn-plugin.h
+
+define _make_nmdbus_rule
+$(1): $(patsubst nmdbus-%.c,nm-%.xml,$(1))
+	$$(AM_V_GEN) gdbus-codegen \
+		--generate-c-code $$(basename $$@) \
+		--c-namespace NMDBus \
+		--interface-prefix org.freedesktop.NetworkManager \
+		$$<
+
+$(basename $(1)).h: $(1)
+	@true
+endef
+
+$(foreach f,$(filter %.c,$(nodist_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f)))
+
+CLEANFILES = $(nodist_libnmdbus_la_SOURCES)
+
 EXTRA_DIST = \
 	all.xml.in \
 	generic-types.xml \
 	errors.xml \
 	vpn-errors.xml \
 	nm-access-point.xml \
-	nm-device-bt.xml \
-	nm-device-wifi.xml \
-	nm-device-olpc-mesh.xml \
-	nm-device-ethernet.xml \
+	nm-active-connection.xml \
+	nm-agent-manager.xml \
 	nm-device-adsl.xml \
-	nm-device-modem.xml \
-	nm-device-wimax.xml \
-	nm-device-infiniband.xml \
 	nm-device-bond.xml \
-	nm-device-team.xml \
 	nm-device-bridge.xml \
-	nm-device-vlan.xml \
+	nm-device-bt.xml \
+	nm-device-ethernet.xml \
 	nm-device-generic.xml \
-	nm-device-veth.xml \
-	nm-device-tun.xml \
+	nm-device-gre.xml \
+	nm-device-infiniband.xml \
 	nm-device-macvlan.xml \
+	nm-device-modem.xml \
+	nm-device-olpc-mesh.xml \
+	nm-device-team.xml \
+	nm-device-tun.xml \
+	nm-device-veth.xml \
+	nm-device-vlan.xml \
 	nm-device-vxlan.xml \
-	nm-device-gre.xml \
+	nm-device-wifi.xml \
+	nm-device-wimax.xml \
 	nm-device.xml \
+	nm-dhcp4-config.xml \
+	nm-dhcp6-config.xml \
 	nm-ip4-config.xml \
 	nm-ip6-config.xml \
 	nm-manager.xml \
-	nm-settings.xml \
+	nm-ppp-manager.xml \
+	nm-secret-agent.xml \
 	nm-settings-connection.xml \
-	nm-vpn-plugin.xml \
+	nm-settings.xml \
 	nm-vpn-connection.xml \
-	nm-ppp-manager.xml \
-	nm-active-connection.xml \
-	nm-dhcp4-config.xml \
-	nm-dhcp6-config.xml \
-	nm-agent-manager.xml \
-	nm-wimax-nsp.xml \
-	nm-secret-agent.xml
-
+	nm-vpn-plugin.xml \
+	nm-wimax-nsp.xml
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index 9e6cc901..f31fafcc 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -79,7 +80,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = introspection
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/all.xml.in
+	$(srcdir)/all.xml.in $(top_srcdir)/build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
 	$(top_srcdir)/m4/compiler_warnings.m4 \
@@ -100,6 +101,27 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = all.xml
 CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libnmdbus_la_LIBADD =
+nodist_libnmdbus_la_OBJECTS = nmdbus-access-point.lo \
+	nmdbus-active-connection.lo nmdbus-agent-manager.lo \
+	nmdbus-device-bond.lo nmdbus-device-bridge.lo \
+	nmdbus-device-bt.lo nmdbus-device-ethernet.lo nmdbus-device.lo \
+	nmdbus-device-generic.lo nmdbus-device-gre.lo \
+	nmdbus-device-infiniband.lo nmdbus-device-macvlan.lo \
+	nmdbus-device-tun.lo nmdbus-device-veth.lo \
+	nmdbus-device-vlan.lo nmdbus-device-vxlan.lo \
+	nmdbus-device-wifi.lo nmdbus-device-wimax.lo \
+	nmdbus-dhcp4-config.lo nmdbus-dhcp6-config.lo \
+	nmdbus-ip4-config.lo nmdbus-ip6-config.lo nmdbus-manager.lo \
+	nmdbus-ppp-manager.lo nmdbus-secret-agent.lo \
+	nmdbus-settings-connection.lo nmdbus-settings.lo \
+	nmdbus-vpn-connection.lo nmdbus-vpn-plugin.lo
+libnmdbus_la_OBJECTS = $(nodist_libnmdbus_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -112,7 +134,29 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-SOURCES =
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(nodist_libnmdbus_la_SOURCES)
 DIST_SOURCES =
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -120,6 +164,24 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -130,6 +192,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLUEZ5_CFLAGS = @BLUEZ5_CFLAGS@
+BLUEZ5_LIBS = @BLUEZ5_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -253,6 +317,7 @@ NEWT_CFLAGS = @NEWT_CFLAGS@
 NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
+NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
@@ -272,6 +337,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -298,7 +364,7 @@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
 SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
+UDEV_DIR = @UDEV_DIR@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
@@ -377,49 +443,123 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 with_valgrind = @with_valgrind@
+noinst_LTLIBRARIES = \
+	libnmdbus.la
+
+
+# gdbus-codegen 2.38 will emit code that requires glib 2.38, which
+# will then cause availability warnings if we define
+# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32.
+#
+# This is fixed in GLib 2.40 (it emits code that takes
+# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go
+# away when we depend on that.
+AM_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS))
+nodist_libnmdbus_la_SOURCES = \
+	nmdbus-access-point.c \
+	nmdbus-access-point.h \
+	nmdbus-active-connection.c \
+	nmdbus-active-connection.h \
+	nmdbus-agent-manager.c \
+	nmdbus-agent-manager.h \
+	nmdbus-device-bond.c \
+	nmdbus-device-bond.h \
+	nmdbus-device-bridge.c \
+	nmdbus-device-bridge.h \
+	nmdbus-device-bt.c \
+	nmdbus-device-bt.h \
+	nmdbus-device-ethernet.c \
+	nmdbus-device-ethernet.h \
+	nmdbus-device.c \
+	nmdbus-device.h \
+	nmdbus-device-generic.c \
+	nmdbus-device-generic.h \
+	nmdbus-device-gre.c \
+	nmdbus-device-gre.h \
+	nmdbus-device-infiniband.c \
+	nmdbus-device-infiniband.h \
+	nmdbus-device-macvlan.c \
+	nmdbus-device-macvlan.h \
+	nmdbus-device-tun.c \
+	nmdbus-device-tun.h \
+	nmdbus-device-veth.c \
+	nmdbus-device-veth.h \
+	nmdbus-device-vlan.c \
+	nmdbus-device-vlan.h \
+	nmdbus-device-vxlan.c \
+	nmdbus-device-vxlan.h \
+	nmdbus-device-wifi.c \
+	nmdbus-device-wifi.h \
+	nmdbus-device-wimax.c \
+	nmdbus-device-wimax.h \
+	nmdbus-dhcp4-config.c \
+	nmdbus-dhcp4-config.h \
+	nmdbus-dhcp6-config.c \
+	nmdbus-dhcp6-config.h \
+	nmdbus-ip4-config.c \
+	nmdbus-ip4-config.h \
+	nmdbus-ip6-config.c \
+	nmdbus-ip6-config.h \
+	nmdbus-manager.c \
+	nmdbus-manager.h \
+	nmdbus-ppp-manager.c \
+	nmdbus-ppp-manager.h \
+	nmdbus-secret-agent.c \
+	nmdbus-secret-agent.h \
+	nmdbus-settings-connection.c \
+	nmdbus-settings-connection.h \
+	nmdbus-settings.c \
+	nmdbus-settings.h \
+	nmdbus-vpn-connection.c \
+	nmdbus-vpn-connection.h \
+	nmdbus-vpn-plugin.c \
+	nmdbus-vpn-plugin.h
+
+CLEANFILES = $(nodist_libnmdbus_la_SOURCES)
 EXTRA_DIST = \
 	all.xml.in \
 	generic-types.xml \
 	errors.xml \
 	vpn-errors.xml \
 	nm-access-point.xml \
-	nm-device-bt.xml \
-	nm-device-wifi.xml \
-	nm-device-olpc-mesh.xml \
-	nm-device-ethernet.xml \
+	nm-active-connection.xml \
+	nm-agent-manager.xml \
 	nm-device-adsl.xml \
-	nm-device-modem.xml \
-	nm-device-wimax.xml \
-	nm-device-infiniband.xml \
 	nm-device-bond.xml \
-	nm-device-team.xml \
 	nm-device-bridge.xml \
-	nm-device-vlan.xml \
+	nm-device-bt.xml \
+	nm-device-ethernet.xml \
 	nm-device-generic.xml \
-	nm-device-veth.xml \
-	nm-device-tun.xml \
+	nm-device-gre.xml \
+	nm-device-infiniband.xml \
 	nm-device-macvlan.xml \
+	nm-device-modem.xml \
+	nm-device-olpc-mesh.xml \
+	nm-device-team.xml \
+	nm-device-tun.xml \
+	nm-device-veth.xml \
+	nm-device-vlan.xml \
 	nm-device-vxlan.xml \
-	nm-device-gre.xml \
+	nm-device-wifi.xml \
+	nm-device-wimax.xml \
 	nm-device.xml \
+	nm-dhcp4-config.xml \
+	nm-dhcp6-config.xml \
 	nm-ip4-config.xml \
 	nm-ip6-config.xml \
 	nm-manager.xml \
-	nm-settings.xml \
+	nm-ppp-manager.xml \
+	nm-secret-agent.xml \
 	nm-settings-connection.xml \
-	nm-vpn-plugin.xml \
+	nm-settings.xml \
 	nm-vpn-connection.xml \
-	nm-ppp-manager.xml \
-	nm-active-connection.xml \
-	nm-dhcp4-config.xml \
-	nm-dhcp6-config.xml \
-	nm-agent-manager.xml \
-	nm-wimax-nsp.xml \
-	nm-secret-agent.xml
+	nm-vpn-plugin.xml \
+	nm-wimax-nsp.xml
 
 all: all-am
 
 .SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -453,17 +593,134 @@ $(am__aclocal_m4_deps):
 all.xml: $(top_builddir)/config.status $(srcdir)/all.xml.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libnmdbus.la: $(libnmdbus_la_OBJECTS) $(libnmdbus_la_DEPENDENCIES) $(EXTRA_libnmdbus_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libnmdbus_la_OBJECTS) $(libnmdbus_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-access-point.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-active-connection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-agent-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-bond.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-bridge.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-bt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-ethernet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-generic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-gre.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-infiniband.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-macvlan.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-tun.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-veth.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-vlan.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-vxlan.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-wifi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-wimax.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-dhcp4-config.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-dhcp6-config.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-ip4-config.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-ip6-config.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-ppp-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-secret-agent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-settings-connection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-settings.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-vpn-connection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-vpn-plugin.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
 
-cscope cscopelist:
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -497,7 +754,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(LTLIBRARIES)
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -521,6 +778,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -531,11 +789,14 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
 
 dvi: dvi-am
 
@@ -578,12 +839,14 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
 
 pdf: pdf-am
 
@@ -597,18 +860,34 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
+	tags tags-am uninstall uninstall-am
+
+
+define _make_nmdbus_rule
+$(1): $(patsubst nmdbus-%.c,nm-%.xml,$(1))
+	$$(AM_V_GEN) gdbus-codegen \
+		--generate-c-code $$(basename $$@) \
+		--c-namespace NMDBus \
+		--interface-prefix org.freedesktop.NetworkManager \
+		$$<
+
+$(basename $(1)).h: $(1)
+	@true
+endef
 
+$(foreach f,$(filter %.c,$(nodist_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f)))
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/introspection/nm-device-ethernet.xml b/introspection/nm-device-ethernet.xml
index 000caf75..2554bda1 100644
--- a/introspection/nm-device-ethernet.xml
+++ b/introspection/nm-device-ethernet.xml
@@ -2,6 +2,7 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Device.Wired">
+    <annotation name="org.gtk.GDBus.C.Name" value="DeviceEthernet"/>
 
     <property name="HwAddress" type="s" access="read">
       <tp:docstring>
diff --git a/introspection/nm-device-vlan.xml b/introspection/nm-device-vlan.xml
index 54b7bbe4..992340e0 100644
--- a/introspection/nm-device-vlan.xml
+++ b/introspection/nm-device-vlan.xml
@@ -15,6 +15,12 @@
       </tp:docstring>
     </property>
 
+    <property name="Parent" type="o" access="read">
+      <tp:docstring>
+        Object path of the parent device of this VLAN device.
+      </tp:docstring>
+    </property>
+
     <property name="VlanId" type="u" access="read">
       <tp:docstring>
         The VLAN ID of this VLAN interface.
diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml
index 65c7b71d..2476fd7d 100644
--- a/introspection/nm-device-wifi.xml
+++ b/introspection/nm-device-wifi.xml
@@ -2,6 +2,8 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Device.Wireless">
+    <annotation name="org.gtk.GDBus.C.Name" value="DeviceWifi"/>
+
     <method name="GetAccessPoints">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_access_points"/>
       <arg name="access_points" type="ao" direction="out">
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index f459bce4..0c2a330c 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -106,7 +106,8 @@
         If TRUE, indicates the device is allowed to autoconnect.  If FALSE,
         manual intervention is required before the device will automatically
         connect to a known network, such as activating a connection using the
-        device, or setting this property to TRUE.
+        device, or setting this property to TRUE.  This property cannot be
+        set to TRUE for default-unmanaged devices, since they never autoconnect.
       </tp:docstring>
     </property>
     <property name="FirmwareMissing" type="b" access="read">
@@ -147,6 +148,15 @@
       </tp:docstring>
     </method>
 
+    <method name="Delete">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_delete"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <tp:docstring>
+        Deletes a software device from NetworkManager and removes the interface from the system.
+        The method returns an error when called for a hardware device.
+      </tp:docstring>
+    </method>
+
     <signal name="StateChanged">
       <arg name="new_state" type="u" tp:type="NM_DEVICE_STATE">
         <tp:docstring>
diff --git a/introspection/nm-ip4-config.xml b/introspection/nm-ip4-config.xml
index 6a8750b7..98076534 100644
--- a/introspection/nm-ip4-config.xml
+++ b/introspection/nm-ip4-config.xml
@@ -2,20 +2,42 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.IP4Config">
+    <property name="Addresses" type="aau" access="read">
+      <tp:docstring>
+	Array of arrays of IPv4 address/prefix/gateway.  All 3
+	elements of each array are in network byte order.  Essentially:
+	[(addr, prefix, gateway), (addr, prefix, gateway), ...]
+
+	Deprecated: use AddressData and Gateway
+      </tp:docstring>
+    </property>
+    <property name="AddressData" type="aa{sv}" access="read">
+      <tp:docstring>
+	Array of IP address data objects. All addresses will include
+	"address" (an IP address string), and "prefix" (a uint). Some
+	addresses may include additional attributes.
+      </tp:docstring>
+    </property>
     <property name="Gateway" type="s" access="read">
       <tp:docstring>The gateway in use.</tp:docstring>
     </property>
-    <property name="Addresses" type="aau" access="read">
-      <tp:docstring>Array of tuples of IPv4 address/prefix/gateway.  All 3
-      elements of each tuple are in network byte order.  Essentially:
-      [(addr, prefix, gateway), (addr, prefix, gateway), ...]
+    <property name="Routes" type="aau" access="read">
+      <tp:docstring>
+	Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of
+	each tuple are in network byte order. 'route' and 'next hop'
+	are IPv4 addresses, while prefix and metric are simple
+	unsigned integers. Essentially: [(route, prefix, next-hop,
+	metric), (route, prefix, next-hop, metric), ...]
+
+	Deprecated: use RouteData
       </tp:docstring>
     </property>
-    <property name="Routes" type="aau" access="read">
-      <tp:docstring>Tuples of IPv4 route/prefix/next-hop/metric.  All 4 elements
-      of each tuple are in network byte order.  'route' and 'next hop' are IPv4
-      addresses, while prefix and metric are simple unsigned integers.  Essentially:
-      [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), ...]
+    <property name="RouteData" type="aa{sv}" access="read">
+      <tp:docstring>
+	Array of IP route data objects. All routes will include "dest"
+	(an IP address string) and "prefix" (a uint). Some routes may
+	include "next-hop" (an IP address string), "metric" (a uint),
+	and additional attributes.
       </tp:docstring>
     </property>
     <property name="Nameservers" type="au" access="read">
diff --git a/introspection/nm-ip6-config.xml b/introspection/nm-ip6-config.xml
index 55c519e7..985dd2e3 100644
--- a/introspection/nm-ip6-config.xml
+++ b/introspection/nm-ip6-config.xml
@@ -2,14 +2,37 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.IP6Config">
+    <property name="Addresses" type="a(ayuay)" access="read">
+      <tp:docstring>
+	Array of tuples of IPv6 address/prefix/gateway.
+
+	Deprecated: use AddressData and Gateway.
+      </tp:docstring>
+    </property>
+    <property name="AddressData" type="aa{sv}" access="read">
+      <tp:docstring>
+	Array of IP address data objects. All addresses will include
+	"address" (an IP address string), and "prefix" (a uint). Some
+	addresses may include additional attributes.
+      </tp:docstring>
+    </property>
     <property name="Gateway" type="s" access="read">
       <tp:docstring>The gateway in use.</tp:docstring>
     </property>
-    <property name="Addresses" type="a(ayuay)" access="read">
-      <tp:docstring>Tuples of IPv6 address/prefix/gateway.</tp:docstring>
-    </property>
     <property name="Routes" type="a(ayuayu)" access="read">
-      <tp:docstring>Tuples of IPv6 route/prefix/next-hop/metric.</tp:docstring>
+      <tp:docstring>
+	Tuples of IPv6 route/prefix/next-hop/metric.
+
+	Deprecated: use RouteData
+      </tp:docstring>
+    </property>
+    <property name="RouteData" type="aa{sv}" access="read">
+      <tp:docstring>
+	Array of IP route data objects. All routes will include "dest"
+	(an IP address string) and "prefix" (a uint). Some routes may
+	include "next-hop" (an IP address string), "metric" (a uint),
+	and additional attributes.
+      </tp:docstring>
     </property>
     <property name="Nameservers" type="aay" access="read">
       <tp:docstring>The nameservers in use.</tp:docstring>
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index 6af2be30..a9bb6dcf 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -2,6 +2,8 @@
 
 <node name="/org/freedesktop/NetworkManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager">
+    <annotation name="org.gtk.GDBus.C.Name" value="Manager"/>
+
     <method name="GetDevices">
       <tp:docstring>
         Get the list of network devices.
@@ -71,16 +73,6 @@
           The path of the active connection object representing this active connection.
         </tp:docstring>
       </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownConnection"/>
-        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/>
-        <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionActivating">
-          <tp:docstring>Another connection is already activating or the same connection is already active.  FIXME: check if the error name is correct.  FIXME: split into 2 errors?</tp:docstring>
-        </tp:error>
-        <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionInvalid">
-          <tp:docstring>The connection is invalid for this device.</tp:docstring>
-        </tp:error>
-      </tp:possible-errors>
     </method>
 
     <method name="AddAndActivateConnection">
@@ -123,13 +115,6 @@
           The path of the active connection object representing this active connection.
         </tp:docstring>
       </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownConnection"/>
-        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/>
-        <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionInvalid">
-          <tp:docstring>The connection is invalid for this device.</tp:docstring>
-        </tp:error>
-      </tp:possible-errors>
     </method>
 
     <method name="DeactivateConnection">
@@ -215,7 +200,7 @@
       </tp:docstring>
       <arg name="level" type="s" direction="in">
         <tp:docstring>
-          One of [ERR, WARN, INFO, DEBUG].
+          One of [ERR, WARN, INFO, DEBUG, TRACE].
         </tp:docstring>
       </arg>
       <arg name="domains" type="s" direction="in">
@@ -244,7 +229,7 @@
       </tp:docstring>
       <arg name="level" type="s" direction="out">
         <tp:docstring>
-          One of [ERR, WARN, INFO, DEBUG].
+          One of [ERR, WARN, INFO, DEBUG, TRACE].
         </tp:docstring>
       </arg>
       <arg name="domains" type="s" direction="out">
@@ -342,6 +327,14 @@
       </tp:docstring>
     </property>
 
+    <property name="PrimaryConnectionType" type="s" access="read">
+      <tp:docstring>
+        The connection type of the "primary" active connection being
+        used to access the network. This is the same as the Type
+        property on the object indicated by PrimaryConnection.
+      </tp:docstring>
+    </property>
+
     <property name="ActivatingConnection" type="o" access="read">
       <tp:docstring>
         The object path of an active connection that is currently
diff --git a/introspection/nm-ppp-manager.xml b/introspection/nm-ppp-manager.xml
index 9e2dfdb1..5ea1e8b1 100644
--- a/introspection/nm-ppp-manager.xml
+++ b/introspection/nm-ppp-manager.xml
@@ -2,6 +2,8 @@
 
 <node name="/">
   <interface name="org.freedesktop.NetworkManager.PPP">
+    <annotation name="org.gtk.GDBus.C.Name" value="PPP_Manager"/>
+
     <method name="NeedSecrets">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ppp_manager_need_secrets"/>
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
@@ -14,6 +16,11 @@
       <arg name="config" type="a{sv}" direction="in"/>
     </method>
 
+    <method name="SetIp6Config">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ppp_manager_set_ip6_config"/>
+      <arg name="config" type="a{sv}" direction="in"/>
+    </method>
+
     <method name="SetState">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ppp_manager_set_state"/>
       <arg name="state" type="u" direction="in"/>
diff --git a/introspection/nm-settings-connection.xml b/introspection/nm-settings-connection.xml
index b5bd2cd0..b02762d6 100644
--- a/introspection/nm-settings-connection.xml
+++ b/introspection/nm-settings-connection.xml
@@ -93,6 +93,14 @@
             </arg>
         </method>
 
+        <method name="ClearSecrets">
+          <tp:docstring>
+            Clear the secrets belonging to this network connection profile.
+          </tp:docstring>
+          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_clear_secrets"/>
+          <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+        </method>
+
         <method name="Save">
             <tp:docstring>
                 Saves a "dirty" connection (that had previously been
diff --git a/introspection/nm-vpn-connection.xml b/introspection/nm-vpn-connection.xml
index 65b91785..03bbbe98 100644
--- a/introspection/nm-vpn-connection.xml
+++ b/introspection/nm-vpn-connection.xml
@@ -2,6 +2,8 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.VPN.Connection">
+    <annotation name="org.gtk.GDBus.C.Name" value="VpnConnection"/>
+
     <tp:docstring>
       Represents an active connection to a Virtual Private Network.
     </tp:docstring>
diff --git a/introspection/nm-vpn-plugin.xml b/introspection/nm-vpn-plugin.xml
index 07397c2b..adb6a085 100644
--- a/introspection/nm-vpn-plugin.xml
+++ b/introspection/nm-vpn-plugin.xml
@@ -2,6 +2,8 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.VPN.Plugin">
+    <annotation name="org.gtk.GDBus.C.Name" value="VpnPlugin"/>
+
     <tp:docstring>
       This interface is provided by plugins providing VPN services to the NetworkManager daemon.
     </tp:docstring>
@@ -137,7 +139,7 @@
       </arg>
     </method>
 
-    <property name="State" type="u" access="read" tp:type="NM_VPN_CONNECTION_STATE">
+    <property name="State" type="u" access="read" tp:type="NM_VPN_SERVICE_STATE">
       <tp:docstring>
         The state of the plugin.
       </tp:docstring>
@@ -147,7 +149,7 @@
       <tp:docstring>
         Emitted when the plugin state changes.
       </tp:docstring>
-      <arg name="state" type="u" tp:type="NM_VPN_CONNECTION_STATE">
+      <arg name="state" type="u" tp:type="NM_VPN_SERVICE_STATE">
         <tp:docstring>
           The new state of the plugin.
         </tp:docstring>
@@ -251,6 +253,44 @@
       </arg>
     </signal>
 
+    <tp:enum name="NM_VPN_SERVICE_STATE" type="u">
+      <tp:enumvalue suffix="UNKNOWN" value="0">
+        <tp:docstring>
+          The state of the VPN plugin is unknown.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="INIT" value="1">
+        <tp:docstring>
+          The VPN plugin is initialized.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SHUTDOWN" value="2">
+        <tp:docstring>
+          (Not used.)
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="STARTING" value="3">
+        <tp:docstring>
+          The plugin is attempting to connect to a VPN server.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="STARTED" value="4">
+        <tp:docstring>
+          The plugin has connected to a VPN server.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="STOPPING" value="5">
+        <tp:docstring>
+          The plugin is disconnecting from the VPN server.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="STOPPED" value="6">
+        <tp:docstring>
+          The plugin has disconnected from the VPN server.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+
     <tp:enum name="NM_VPN_PLUGIN_FAILURE" type="u">
       <tp:enumvalue suffix="LOGIN_FAILED" value="0">
         <tp:docstring>