From d040fd18ab37a270f83e8dd4ff974f0360a7da38 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@redhat.com>
Date: Tue, 14 Apr 2015 09:40:49 -0400
Subject: [PATCH] introspection: trivial fixes

Add some missing files to libnmdbus.la. Add missing name-fixing
annotations to the XML to make all generated NMDBus types match the
names of their corresponding NM types.
---
 introspection/Makefile.am              | 8 ++++++++
 introspection/nm-active-connection.xml | 1 +
 introspection/nm-dhcp4-config.xml      | 1 +
 introspection/nm-dhcp6-config.xml      | 1 +
 4 files changed, 11 insertions(+)

diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 3cf0873396..c8a70cffc7 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -17,6 +17,8 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-active-connection.h \
 	nmdbus-agent-manager.c \
 	nmdbus-agent-manager.h \
+	nmdbus-device-adsl.c \
+	nmdbus-device-adsl.h \
 	nmdbus-device-bond.c \
 	nmdbus-device-bond.h \
 	nmdbus-device-bridge.c \
@@ -35,6 +37,12 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-device-infiniband.h \
 	nmdbus-device-macvlan.c \
 	nmdbus-device-macvlan.h \
+	nmdbus-device-modem.c \
+	nmdbus-device-modem.h \
+	nmdbus-device-olpc-mesh.c \
+	nmdbus-device-olpc-mesh.h \
+	nmdbus-device-team.c \
+	nmdbus-device-team.h \
 	nmdbus-device-tun.c \
 	nmdbus-device-tun.h \
 	nmdbus-device-veth.c \
diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml
index cbecdfcefe..4d5d15a1e5 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/nm-active-connection.xml
@@ -2,6 +2,7 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Connection.Active">
+    <annotation name="org.gtk.GDBus.C.Name" value="ActiveConnection"/>
     <tp:docstring>
       Objects that implement the Connection.Active interface represent an attempt
       to connect to a network using the details provided by a Connection object.
diff --git a/introspection/nm-dhcp4-config.xml b/introspection/nm-dhcp4-config.xml
index c0821ada97..379c50f9b0 100644
--- a/introspection/nm-dhcp4-config.xml
+++ b/introspection/nm-dhcp4-config.xml
@@ -2,6 +2,7 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
     <interface name="org.freedesktop.NetworkManager.DHCP4Config">
+        <annotation name="org.gtk.GDBus.C.Name" value="Dhcp4Config"/>
         <tp:docstring>
             Options and configuration returned by the IPv4 DHCP server.
         </tp:docstring>
diff --git a/introspection/nm-dhcp6-config.xml b/introspection/nm-dhcp6-config.xml
index 93b0f1c8f0..df75660a70 100644
--- a/introspection/nm-dhcp6-config.xml
+++ b/introspection/nm-dhcp6-config.xml
@@ -2,6 +2,7 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
     <interface name="org.freedesktop.NetworkManager.DHCP6Config">
+        <annotation name="org.gtk.GDBus.C.Name" value="Dhcp6Config"/>
         <tp:docstring>
             Options and configuration returned by the IPv6 DHCP server.
         </tp:docstring>