Imported Upstream version 0.7.991upstream/0.7.991

author: Guido Günther <agx@sigxcpu.org> 2014-02-05 08:38:30 +0100
committer: Guido Günther <agx@sigxcpu.org> 2014-02-05 08:38:30 +0100
commit: 13ed135b9ae78c692dc359976eb8b54d0a3629b8 (patch)
tree: ae2ea713ad51d73980cf83db1411d6589dac5e8b /introspection
parent: 14d771b90f5a7d3887e5e900d1fb4737477ad305 (diff)
34 files changed, 2635 insertions, 2418 deletions
diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 3c7a380..f29f8dc 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -1,19 +1,6 @@
-EXTRA_DIST = \
-	all.xml \
-	org.freedesktop.ModemManager.xml \
-	mm-mobile-error.xml \
-	org.freedesktop.ModemManager.Modem.xml \
-	org.freedesktop.ModemManager.Modem.Cdma.xml \
-	mm-modem-connect-error.xml \
-	mm-modem-error.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.Card.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.Hso.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.Network.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.SMS.xml \
-	org.freedesktop.ModemManager.Modem.Simple.xml \
-	mm-serial-error.xml \
-	org.freedesktop.ModemManager.Modem.Location.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml \
-	org.freedesktop.DBus.Properties.xml
+# DBus Introspection files
+XMLS = $(wildcard *.xml)
+xmldir = $(datadir)/dbus-1/interfaces
+xml_DATA = $(filter-out all.xml, $(XMLS))
+
+EXTRA_DIST = $(XMLS)
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index 907f969..3eae466 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +13,53 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,27 +79,73 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = introspection
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+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 =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(xmldir)"
+DATA = $(xml_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -86,13 +177,22 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_MKENUMS = @GLIB_MKENUMS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 GUDEV_CFLAGS = @GUDEV_CFLAGS@
 GUDEV_LIBS = @GUDEV_LIBS@
+HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -104,22 +204,39 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMM_GLIB_CFLAGS = @LIBMM_GLIB_CFLAGS@
+LIBMM_GLIB_LIBS = @LIBMM_GLIB_LIBS@
+LIBMM_LIBS = @LIBMM_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
+MBIM_CFLAGS = @MBIM_CFLAGS@
+MBIM_LIBS = @MBIM_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
+MMCLI_CFLAGS = @MMCLI_CFLAGS@
+MMCLI_LIBS = @MMCLI_LIBS@
 MM_CFLAGS = @MM_CFLAGS@
 MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
@@ -146,15 +263,20 @@ POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
+QMI_CFLAGS = @QMI_CFLAGS@
+QMI_LIBS = @QMI_LIBS@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
 UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -188,6 +310,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -207,26 +331,12 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-	all.xml \
-	org.freedesktop.ModemManager.xml \
-	mm-mobile-error.xml \
-	org.freedesktop.ModemManager.Modem.xml \
-	org.freedesktop.ModemManager.Modem.Cdma.xml \
-	mm-modem-connect-error.xml \
-	mm-modem-error.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.Card.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.Hso.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.Network.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.SMS.xml \
-	org.freedesktop.ModemManager.Modem.Simple.xml \
-	mm-serial-error.xml \
-	org.freedesktop.ModemManager.Modem.Location.xml \
-	org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml \
-	org.freedesktop.DBus.Properties.xml
 
+# DBus Introspection files
+XMLS = $(wildcard *.xml)
+xmldir = $(datadir)/dbus-1/interfaces
+xml_DATA = $(filter-out all.xml, $(XMLS))
+EXTRA_DIST = $(XMLS)
 all: all-am
 
 .SUFFIXES:
@@ -266,11 +376,32 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+install-xmlDATA: $(xml_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(xml_DATA)'; test -n "$(xmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(xmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(xmldir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xmldir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(xmldir)" || exit $$?; \
+	done
 
-ctags: CTAGS
-CTAGS:
+uninstall-xmlDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(xml_DATA)'; test -n "$(xmldir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(xmldir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -305,8 +436,11 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(xmldir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -317,10 +451,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -352,7 +491,7 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-xmlDATA
 
 install-dvi: install-dvi-am
 
@@ -396,20 +535,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-xmlDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	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 mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	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 install-xmlDATA installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-xmlDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/introspection/all.xml b/introspection/all.xml
index ff174d8..1df239e 100644
--- a/introspection/all.xml
+++ b/introspection/all.xml
@@ -2,43 +2,18 @@
    xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
    xmlns:xi="http://www.w3.org/2001/XInclude">
 
-  <tp:title>ModemManager D-Bus Interface Specification</tp:title>
-  <tp:version>0.5</tp:version>
-  <tp:copyright>Copyright (C) 2008 Novell, Inc.</tp:copyright>
-  <tp:copyright>Copyright (C) 2008 - 2010 Red Hat, Inc.</tp:copyright>
+  <xi:include href="org.freedesktop.ModemManager1.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Sim.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Bearer.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Sms.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.Modem3gpp.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.Messaging.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.Location.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.Time.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.Firmware.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.Contacts.xml"/>
 
-  <tp:license xmlns="http://www.w3.org/1999/xhtml">
-    <p>This program is free software; you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation; either version 2 of the License, or
-      (at your option) any later version.</p>
-
-    <p>This program is distributed in the hope that it will be useful,
-      but WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      General Public License for more details.</p>
-
-    <p>You should have received a copy of the GNU Lesser General Public
-      License along with this library; if not, write to the Free Software
-      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
-  </tp:license>
-
-  <xi:include href="org.freedesktop.ModemManager.xml"/>
-  <xi:include href="org.freedesktop.ModemManager.Modem.xml"/>
-  <xi:include href="org.freedesktop.ModemManager.Modem.Simple.xml"/>
-  <xi:include href="org.freedesktop.ModemManager.Modem.Location.xml"/>
-  <xi:include href="org.freedesktop.ModemManager.Modem.Cdma.xml"/>
-  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.xml"/>
-  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.Card.xml"/>
-  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml"/>
-  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.Network.xml"/>
-  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.SMS.xml"/>
-  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.Hso.xml"/>
-  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml"/>
-  <xi:include href="org.freedesktop.DBus.Properties.xml"/>
-
-  <xi:include href="mm-serial-error.xml"/>
-  <xi:include href="mm-modem-error.xml"/>
-  <xi:include href="mm-modem-connect-error.xml"/>
-  <xi:include href="mm-mobile-error.xml"/>
 </tp:spec>
diff --git a/introspection/mm-mobile-error.xml b/introspection/mm-mobile-error.xml
deleted file mode 100644
index 5edbcb7..0000000
--- a/introspection/mm-mobile-error.xml
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" ?>
-<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
-	   namespace="org.freedesktop.ModemManager.Modem.Gsm">
-  <tp:copyright>Copyright (C) 2008 Novell, Inc.</tp:copyright>
-
-  <tp:error name="PhoneFailure">
-    <tp:docstring>
-      A phone failure.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="NoConnection">
-    <tp:docstring>
-      No connection to phone.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="LinkReserved">
-    <tp:docstring>
-      Phone-adaptor link reserved.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="OperationNotAllowed">
-    <tp:docstring>
-      Operation not allowed.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="OperationNotSupported">
-    <tp:docstring>
-      Operation not supported.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="PhSimPinRequired">
-    <tp:docstring>
-      PH-SIM PIN required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="PhFSimPinRequired">
-    <tp:docstring>
-      PH-FSIM PIN required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="PhFSimPukRequired">
-    <tp:docstring>
-      PH-FSIM PUK required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="SimNotInserted">
-    <tp:docstring>
-      SIM not inserted.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="SimPinRequired">
-    <tp:docstring>
-      SIM PIN required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="SimPukRequired">
-    <tp:docstring>
-      SIM PUK required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="SimFailure">
-    <tp:docstring>
-      SIM failure.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="SimBusy">
-    <tp:docstring>
-      SIM busy.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="SimWrong">
-    <tp:docstring>
-      SIM wrong.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="IncorrectPassword">
-    <tp:docstring>
-      Incorrect password.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="SimPin2Required">
-    <tp:docstring>
-      SIM PIN2 required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="SimPuk2Required">
-    <tp:docstring>
-      SIM PUK2 required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="MemoryFull">
-    <tp:docstring>
-      Memory full.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="InvalidIndex">
-    <tp:docstring>
-      Invalid index.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="NotFound">
-    <tp:docstring>
-      Not found.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="MemoryFailure">
-    <tp:docstring>
-      Memory failure.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="TextTooLong">
-    <tp:docstring>
-      Text string too long.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="InvalidChars">
-    <tp:docstring>
-      Invalid characters in text string.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="DialStringTooLong">
-    <tp:docstring>
-      Dial string too long.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="InvalidDialString">
-    <tp:docstring>
-      Invalid characters in dial string.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="NoNetwork">
-    <tp:docstring>
-      No network service.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="NetworkTimeout">
-    <tp:docstring>
-      Network timeout.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="NetworkNotAllowed">
-    <tp:docstring>
-      Network not allowed - emergency calls only.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="NetworkPinRequired">
-    <tp:docstring>
-      Network personalization PIN required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="NetworkPukRequired">
-    <tp:docstring>
-      Network personalization PUK required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="NetworkSubsetPinRequired">
-    <tp:docstring>
-      Network subset personalization PIN required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="NetworkSubsetPukRequired">
-    <tp:docstring>
-      Network subset personalization PUK required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="ServicePinRequired">
-    <tp:docstring>
-      Service provider personalization PIN required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="ServicePukRequired">
-    <tp:docstring>
-      Service provider personalization PUK required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="CorporatePinRequired">
-    <tp:docstring>
-      Corporate personalization PIN required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="CorporatePukRequired">
-    <tp:docstring>
-      Corporate personalization PUK required.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="HiddenKeyRequired">
-    <tp:docstring>
-      Hidden key required. This key is required when accessing hidden phonebook entries.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="EapMethodNotSupported">
-    <tp:docstring>
-      EAP method not supported.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="IncorrectParams">
-    <tp:docstring>
-      Incorrect parameters.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="Unknown">
-    <tp:docstring>
-      An unknown error.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsIllegalMs">
-    <tp:docstring>
-      Illegal MS.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsIllegalMe">
-    <tp:docstring>
-      Illegal ME.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsServiceNotAllowed">
-    <tp:docstring>
-      GPRS services not allowed.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsPlmnNotAllowed">
-    <tp:docstring>
-      PLMN not allowed.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsLocationNotAllowed">
-    <tp:docstring>
-      Location area not allowed.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsRoamingNotAllowed">
-    <tp:docstring>
-      Roaming not allowed in this location area.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsOptionNotSupported">
-    <tp:docstring>
-      Service option not supported.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsNotSubscribed">
-    <tp:docstring>
-      Requested service option not subscribed.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsOutOfOrder">
-    <tp:docstring>
-      Service option temporarily out of order.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsPdpAuthFailure">
-    <tp:docstring>
-      PDP authentication failure.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsUnspecified">
-    <tp:docstring>
-      Unspecified GPRS error
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="GprsInvalidClass">
-    <tp:docstring>
-      Invalid mobile class.
-    </tp:docstring>
-  </tp:error>
-
-</tp:errors>
diff --git a/introspection/mm-modem-connect-error.xml b/introspection/mm-modem-connect-error.xml
deleted file mode 100644
index b983702..0000000
--- a/introspection/mm-modem-connect-error.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" ?>
-<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
-	   namespace="org.freedesktop.ModemManager.Modem">
-  <tp:copyright>Copyright (C) 2008 Novell, Inc.</tp:copyright>
-
-  <tp:error name="NoCarrier">
-    <tp:docstring>
-      No carrier.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="NoDialtone">
-    <tp:docstring>
-      No dialtone.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="Busy">
-    <tp:docstring>
-      Busy.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="NoAnswer">
-    <tp:docstring>
-      No answer.
-    </tp:docstring>
-  </tp:error>
-
-</tp:errors>
diff --git a/introspection/mm-modem-error.xml b/introspection/mm-modem-error.xml
deleted file mode 100644
index 200e093..0000000
--- a/introspection/mm-modem-error.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" ?>
-<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
-	   namespace="org.freedesktop.ModemManager.Modem">
-  <tp:copyright>Copyright (C) 2008 Novell, Inc.</tp:copyright>
-
-  <tp:error name="General">
-    <tp:docstring>
-      A generic error. An example of a generic error is ModemManager not being able to parse the response from modem.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="OperationNotSupported">
-    <tp:docstring>
-      Operation not implemented by modem.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="Connected">
-    <tp:docstring>
-      Operation could not be performed while the modem is connected.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="Disconnected">
-    <tp:docstring>
-      Operation could not be performed while the modem is disconnected.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="OperationInProgress">
-    <tp:docstring>
-      Operation could not be performed because it is already in progress.
-    </tp:docstring>
-  </tp:error>
-
-</tp:errors>
diff --git a/introspection/mm-serial-error.xml b/introspection/mm-serial-error.xml
deleted file mode 100644
index 338a223..0000000
--- a/introspection/mm-serial-error.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" ?>
-<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
-	   namespace="org.freedesktop.ModemManager.Modem">
-  <tp:copyright>Copyright (C) 2008 Novell, Inc.</tp:copyright>
-
-  <tp:error name="SerialOpenFailed">
-    <tp:docstring>
-      Could not open serial device.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="SerialSendFailed">
-    <tp:docstring>
-      Could not write to the serial device.
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="SerialResponseTimeout">
-    <tp:docstring>
-      A response was not received in time.
-    </tp:docstring>
-  </tp:error>
-
-</tp:errors>
diff --git a/introspection/org.freedesktop.DBus.Properties.xml b/introspection/org.freedesktop.DBus.Properties.xml
deleted file mode 100644
index b2d0923..0000000
--- a/introspection/org.freedesktop.DBus.Properties.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.DBus.Properties">
-    <signal name="MmPropertiesChanged">
-      <tp:docstring>
-	One or more properties' values changed.
-      </tp:docstring>
-      <arg name="interface" type="s">
-	<tp:docstring>
-	  The D-Bus interface of the changed properties.
-	</tp:docstring>
-      </arg>
-      <arg name="properties" type="a{sv}">
-	<tp:docstring>
-	  The changed property names and their new values.
-	</tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="PropertiesChanged">
-      <tp:docstring>
-	One or more properties value changed; this signal implements the
-	D-Bus specification's PropertiesChanged signal.
-      </tp:docstring>
-      <arg name="interface" type="s">
-	<tp:docstring>
-	  The D-Bus interface of the changed properties.
-	</tp:docstring>
-      </arg>
-      <arg name="changed_properties" type="a{sv}">
-	<tp:docstring>
-	  The changed property names and their new values.
-	</tp:docstring>
-      </arg>
-      <arg name="invalidated_properties" type="as">
-	<tp:docstring>
-	  Properties which are now invalid, but for which the new value is not
-	  emitted in this signal.  Clients interested in these properties should
-	  issue a Get request for them to retrieve the new value.
-	</tp:docstring>
-      </arg>
-    </signal>
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Cdma.xml b/introspection/org.freedesktop.ModemManager.Modem.Cdma.xml
deleted file mode 100644
index d80d9b9..0000000
--- a/introspection/org.freedesktop.ModemManager.Modem.Cdma.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Cdma">
-
-    <method name="Activate">
-      <tp:docstring>
-        Activates the modem for use with a given carrier.  In the
-        event of immediate failure, returns an error value instead of
-        setting a DBus error.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_activate"/>
-      <arg name="carrier" type="s" direction="in">
-        <tp:docstring>
-          Name of carrier.
-        </tp:docstring>
-      </arg>
-      <arg name="immediate_error" type="u" direction="out">
-        <tp:docstring>
-          An enum from MM_MODEM_CDMA_ACTIVATION_ERROR.  This is
-          returned for immediate errors.  Delayed errors are returned
-          via an ActivationStateChanged signal
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="ActivateManual">
-      <tp:docstring>
-        Sets modem configuration data.  Unlike regular Activate(),
-        this does not contact the carrier.  Some modems will reboot
-        after this call is made.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_activate_manual"/>
-      <arg name="properties" type="a{sv}" direction="in">
-        <tp:docstring>
-          A dictionary of properties to set on the modem.  Keys include 'mdn', 'min'
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <signal name="ActivationStateChanged">
-      <tp:docstring>
-	    The device activation state changed.
-      </tp:docstring>
-      <arg name="activation_state" type="u" tp:type="MM_MODEM_CDMA_ACTIVATION_STATE">
-        <tp:docstring>Current activation state</tp:docstring>
-      </arg>
-      <arg name="activation_error" type="u" tp:type="MM_MODEM_CDMA_ACTIVATION_ERROR">
-        <tp:docstring>Carrier-specific error code</tp:docstring>
-      </arg>
-      <arg name="status_changes" type="a{sv}">
-        <tp:docstring>Selected Modem.Simple.GetStatus keys that have changed as a
-          result of this activation state change.  Will include 'mdn'
-          and 'min'.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <method name="GetSignalQuality">
-      <tp:docstring>
-	Get the current signal quality.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_signal_quality"/>
-      <arg name="quality" type="u" direction="out">
-	<tp:docstring>
-	  Signal quality (percent).
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetEsn">
-      <tp:docstring>
-        Get the Electronic Serial Number of the card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_esn"/>
-      <arg name="esn" type="s" direction="out">
-        <tp:docstring>
-          The ESN.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetServingSystem">
-      <tp:docstring>
-        Get the Service System details of the current network, if registered.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_serving_system"/>
-      <arg name="info" type="(usu)" direction="out">
-        <tp:docstring>
-          A structure containing the Band Class (0 = unknown, 1 = 800 MHz, 2 = 1900 MHz), the Band ("A" - "F" as defined by IS707-A), and the System ID of the serving network.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <signal name="SignalQuality">
-      <tp:docstring>
-	The signal quality changed.
-      </tp:docstring>
-      <arg name="quality" type="u">
-	<tp:docstring>
-	  The new quality in percent, 0..100.
-	</tp:docstring>
-      </arg>
-    </signal>
-
-    <method name="GetRegistrationState">
-      <tp:docstring>Get device registration state.</tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_registration_state"/>
-      <arg name="cdma_1x_state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>CDMA 1x registration state.</tp:docstring>
-      </arg>
-      <arg name="evdo_state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>EVDO registration state.</tp:docstring>
-      </arg>
-    </method>
-
-    <property name="Meid" type="s" access="read">
-      <tp:docstring>
-        The modem's Mobile Equipment Identifier.
-      </tp:docstring>
-    </property>
-
-    <signal name="RegistrationStateChanged">
-      <tp:docstring>
-	The device registration state changed.
-      </tp:docstring>
-      <arg name="cdma-1x-state" type="u" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>CDMA 1x registration state.</tp:docstring>
-      </arg>
-      <arg name="evdo-state" type="u" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>EVDO registration state.</tp:docstring>
-      </arg>
-    </signal>
-
-    <tp:enum name="MM_MODEM_CDMA_REGISTRATION_STATE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>Registration status is unknown or the device is not registered.</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="REGISTERED" value="1">
-        <tp:docstring>Registered, but roaming status is unknown or cannot be provided by the device.  The device may or may not be roaming.</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="HOME" value="2">
-        <tp:docstring>Currently registered on the home network.</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ROAMING" value="3">
-        <tp:docstring>Currently registered on a roaming network.</tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:enum name="MM_MODEM_CDMA_ACTIVATION_STATE" type="u">
-      <tp:enumvalue suffix="NOT_ACTIVATED" value="0">
-        <tp:docstring>Device is not activated</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATING" value="1">
-        <tp:docstring>Device is activating</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PARTIALLY_ACTIVATED" value="2">
-        <tp:docstring>Device is partially activated; carrier-specific steps required to continue.</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATED" value="3">
-        <tp:docstring>Device is ready for use.</tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:enum name="MM_MODEM_CDMA_ACTIVATION_ERROR" type="u">
-      <tp:enumvalue suffix="NO_ERROR" value="0"/>
-      <tp:enumvalue suffix="ROAMING" value="1">
-        <tp:docstring>
-          Device cannot activate while roaming.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="WRONG_RADIO_INTERFACE" value="2">
-        <tp:docstring>
-          Device cannot activate on this network type (eg EVDO vs 1xRTT).
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="COULD_NOT_CONNECT" value="3">
-        <tp:docstring>
-          Device could not connect to the network for activation.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SECURITY_AUTHENTICATION_FAILED" value="4">
-        <tp:docstring>
-          Device could not authenticate to the network for activation.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PROVISIONING_FAILED" value="5">
-        <tp:docstring>
-          Later stages of device provisioning failed.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NO_SIGNAL" value="6">
-        <tp:docstring>
-          No signal available.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="UNKNOWN" value="7">
-        <tp:docstring>
-          An error occurred.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="TIMED_OUT" value="8">
-        <tp:docstring>
-          Activation timed out.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="START_FAILED" value="9">
-        <tp:docstring>
-          API call for initial activation failed.
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Card.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Card.xml
deleted file mode 100644
index e6af331..0000000
--- a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Card.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Gsm.Card">
-    <method name="GetImei">
-      <tp:docstring>
-	Get the IMEI of the card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_imei"/>
-      <arg name="imei" type="s" direction="out">
-	<tp:docstring>
-	  The IMEI.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetImsi">
-      <tp:docstring>
-	Get the IMSI of the SIM card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_imsi"/>
-      <arg name="imsi" type="s" direction="out">
-	<tp:docstring>
-	  The IMSI.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetOperatorId">
-      <tp:docstring>
-        Returns the ID of the network operator that issued the SIM card,
-        formatted as a 5 or 6-digit MCC/MNC code (ex "310410").
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_operator_id"/>
-      <arg name="imsi" type="s" direction="out">
-	<tp:docstring>
-	  The operator ID formatted as an MCC/MNC code.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetSpn">
-      <tp:docstring>
-	Returns the SPN (Service Provider Name) from the SIM card,
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_spn"/>
-      <arg name="spn" type="s" direction="out">
-	<tp:docstring>
-	  The Service Provider Name.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="SendPuk">
-      <tp:docstring>
-	Send the PUK and a new PIN to unlock the SIM card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_send_puk"/>
-      <arg name="puk" type="s" direction="in">
-	<tp:docstring>
-	  The PUK code.
-	</tp:docstring>
-      </arg>
-      <arg name="pin" type="s" direction="in">
-	<tp:docstring>
-	  The PIN code.
-	</tp:docstring>
-      </arg>
-    </method>
-    
-    <method name="SendPin">
-      <tp:docstring>
-	Send the PIN to unlock the SIM card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_send_pin"/>
-      <arg name="pin" type="s" direction="in">
-	<tp:docstring>
-	  The PIN code.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="EnablePin">
-      <tp:docstring>
-	Enable or disable the PIN checking.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_enable_pin"/>
-      <arg name="pin" type="s" direction="in">
-	<tp:docstring>
-	  The PIN code.
-	</tp:docstring>
-      </arg>
-      <arg name="enabled" type="b" direction="in">
-	<tp:docstring>
-	  True to enable PIN checking.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="ChangePin">
-      <tp:docstring>
-	Change the PIN code.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_change_pin"/>
-      <arg name="old_pin" type="s" direction="in">
-	<tp:docstring>
-	  The current PIN code.
-	</tp:docstring>
-      </arg>
-      <arg name="new_pin" type="s" direction="in">
-	<tp:docstring>
-	  The new PIN code.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <property name="SimIdentifier" type="s" access="read">
-      <tp:docstring>
-	An obfuscated SIM identifier based on the IMSI or the ICCID.  This may
-	be available before the PIN has been entered depending on the device
-	itself.
-      </tp:docstring>
-    </property>
-
-    <property name="SupportedBands" type="u" access="read" tp:type="MM_MODEM_GSM_BAND">
-      <tp:docstring>
-        Bands supported by the card.  (Note for plugin writers:
-        returned value must not contain ANY)
-      </tp:docstring>
-    </property>
-
-    <property name="SupportedModes" type="u" access="read" tp:type="MM_MODEM_GSM_MODE">
-      <tp:docstring>
-        Network selection modes supported by the card. (Note for plugin writers:
-        returned value must not contain ANY)
-      </tp:docstring>
-    </property>
-
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml
deleted file mode 100644
index 60b06ad..0000000
--- a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Gsm.Contacts">
-    <method name="Add">
-      <tp:docstring>
-	Add a new contact to the SIM card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_contacts_add"/>
-      <arg name="name" type="s" direction="in">
-	<tp:docstring>
-	  The name of the contact.
-	</tp:docstring>
-      </arg>
-      <arg name="number" type="s" direction="in">
-	<tp:docstring>
-	  The phone number of the contact.
-	</tp:docstring>
-      </arg>
-      <arg name="index" type="u" direction="out">
-	<tp:docstring>
-	  The index of the new contact.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="Delete">
-      <tp:docstring>
-	Delete a contact from the SIM card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_contacts_delete"/>
-      <arg name="index" type="u" direction="in">
-	<tp:docstring>
-	  The index of the contact.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="Get">
-      <tp:docstring>
-	Retrieve a contact from the SIM card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_contacts_get"/>
-      <arg name="index" type="u" direction="in">
-	<tp:docstring>
-	  The index of the contact.
-	</tp:docstring>
-      </arg>
-      <arg name="contact" type="(uss)" direction="out">
-	<tp:docstring>
-	  The contact structure containing index, name, and number.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="List">
-      <tp:docstring>
-	List all contacts on the SIM card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_contacts_list"/>
-      <arg name="results" type="a(uss)" direction="out">
-	<tp:docstring>
-	  The list of contacts where each contact has an index, name, and number.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="Find">
-      <tp:docstring>
-	Find a contact from the SIM card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_contacts_find"/>
-      <arg name="pattern" type="s" direction="in">
-	<tp:docstring>
-	  The pattern to search for.
-	</tp:docstring>
-      </arg>
-      <arg name="results" type="a(uss)" direction="out">
-	<tp:docstring>
-	  The list of matching contacts where a contact has an index, name, and number.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetCount">
-      <tp:docstring>
-	Get the number of contacts stored on the SIM card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_contacts_count"/>
-      <arg name="count" type="u" direction="out">
-	<tp:docstring>
-	  The number of contacts.
-	</tp:docstring>
-      </arg>
-    </method>
-
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml
deleted file mode 100644
index d646acc..0000000
--- a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Gsm.Hso">
-    <method name="Authenticate">
-      <tp:docstring>
-	Authenticate using the passed user name and password.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_hso_authenticate"/>
-      <arg name="username" type="s" direction="in">
-	The user name.
-      </arg>
-      <arg name="password" type="s" direction="in">
-	The password.
-      </arg>
-    </method>
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml
deleted file mode 100644
index 4a8e803..0000000
--- a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
-    <method name="Register">
-      <tp:docstring>
-	Register the device to network.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_register"/>
-      <arg name="network_id" type="s" direction="in">
-	<tp:docstring>
-	  The network ID to register. An empty string can be used to register to the home network.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="Scan">
-      <tp:docstring>
-	Scan for available networks.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_scan"/>
-      <arg name="results" type="aa{ss}" direction="out">
-	<tp:docstring>
-          <p>Found networks. It's an array of dictionaries (strings for both
-          keys and values) with each array element describing a mobile network
-          found in the scan.  Each dict may include one or more of the following
-          keys:</p>
-          <ul>
-            <li>
-              "status": a number representing network availability status as
-              defined in 3GPP TS 27.007 section 7.3.  e.g. "0" (unknown), "1"
-              (available), "2" (current), or "3" (forbidden).  This key will
-              always be present.
-            </li>
-            <li>
-              "operator-long": long-format name of operator.  If the name is
-              unknown, this field should not be present.
-            </li>
-            <li>
-              "operator-short": short-format name of operator.  If the name is
-              unknown, this field should not be present.
-            </li>
-            <li>
-              "operator-num": mobile code of the operator.  Returned in the
-              format "MCCMNC", where MCC is the three-digit ITU E.212 Mobile
-              Country Code and MNC is the  two- or three-digit GSM Mobile
-              Network Code.  e.g. "31026" or "310260".
-            </li>
-            <li>
-              "access-tech": a number representing the access technology used by
-              this mobile network as described in 3GPP TS 27.007 section 7.3.
-              e.g. "0" (GSM), "1" (GSM Compact), "2" (UTRAN/UMTS), "3" (EDGE),
-              etc.
-            </li>
-          </ul>
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="SetApn">
-      <tp:docstring>
-	Set the APN.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_set_apn"/>
-      <arg name="apn" type="s" direction="in">
-	<tp:docstring>
-	  The APN.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetSignalQuality">
-      <tp:docstring>
-	Get the current signal quality.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_signal_quality"/>
-      <arg name="quality" type="u" direction="out">
-	<tp:docstring>
-	  Signal quality (percent).
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="SetBand">
-      <tp:docstring>
-        Sets the bands the device is allowed to use when connecting to a mobile network.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_set_band"/>
-      <arg name="band" type="u" direction="in" tp:type="MM_MODEM_GSM_BAND">
-        <tp:docstring>
-          The desired bands, as a set of flags.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetBand">
-      <tp:docstring>
-        Returns the current bands the device is using.  (Note for plugin writers: returned value must not be ANY)
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_band"/>
-      <arg name="band" type="u" direction="out" tp:type="MM_MODEM_GSM_BAND">
-        <tp:docstring>
-          The current bands, as a set of flags.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="SetNetworkMode">
-      <tp:docstring>
-        Set the desired mode the device may use when connecting to a mobile
-        network (DEPRECATED; see SetAllowedMode instead).
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_set_network_mode"/>
-      <arg name="mode" type="u" direction="in" tp:type="MM_MODEM_GSM_NETWORK_DEPRECATED_MODE">
-        <tp:docstring>
-          The desired network mode.  Only one mode may be specified, and may not be UNKNOWN.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetNetworkMode">
-      <tp:docstring>
-        Returns the current network mode of the device (DEPRECATED; does not
-        allow returning both the saved mode preference *and* the current access
-        technology of the device at the same time.  See the AllowedMode
-        property instead).
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_network_mode"/>
-      <arg name="mode" type="u" direction="out" tp:type="MM_MODEM_GSM_NETWORK_DEPRECATED_MODE">
-        <tp:docstring>
-          Returns the general network mode (ex. 2G/3G preference) of the device.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetRegistrationInfo">
-      <tp:docstring>
-	Get the registration status and the current operator (if registered).
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_reg_info"/>
-      <arg name="info" type="(uss)" direction="out">
-	<tp:docstring>
-          The returned information is composed of the following items in the
-          following order:
-          <ul>
-            <li>
-              Mobile registration status as defined in 3GPP TS 27.007 section
-              10.1.19.  See the MM_MODEM_GSM_NETWORK_REG_STATUS enumeration for
-              possible values.
-            </li>
-            <li>
-              Current operator code of the operator to which the mobile is
-              currently registered.  Returned in the format "MCCMNC", where MCC
-              is the three-digit ITU E.212 Mobile Country Code and MNC is the
-              two- or three-digit GSM Mobile Network Code.  If the MCC and MNC
-              are not known or the mobile is not registered to a mobile network,
-              this value should be a zero-length (blank) string. e.g. "31026"
-              or "310260".
-            </li>
-            <li>
-              Current operator name of the operator to which the mobile is
-              currently registered.  If the operator name is not knowon or the
-              mobile is not registered to a mobile network, this value should
-              be a zero-length (blank) string.
-            </li>
-          </ul>
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="SetAllowedMode">
-      <tp:docstring>
-        Set the access technologies a device is allowed to use when connecting
-        to a mobile network.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_set_allowed_mode"/>
-      <arg name="mode" type="u" direction="in" tp:type="MM_MODEM_GSM_ALLOWED_MODE">
-        <tp:docstring>
-          The allowed mode.  The device may not support all modes; see
-          the org.freedesktop.ModemManager.Gsm.Card.SupportedModes property for
-          allowed modes for each device.  All devices support the "ANY" flag.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <property name="AllowedMode" type="u" access="read" tp:type="MM_MODEM_GSM_ALLOWED_MODE">
-      <tp:docstring>
-        The allowed access technologies (eg 2G/3G preference) the device is allowed
-        to use when connecting to a mobile network.
-      </tp:docstring>
-    </property>
-
-    <property name="AccessTechnology" type="u" access="read" tp:type="MM_MODEM_GSM_ACCESS_TECH">
-      <tp:docstring>
-        The current network access technology used by the device to communicate
-        with the base station.  (Note to plugin writers: if the device's access
-        technology cannot be determined, use UNKNOWN)
-      </tp:docstring>
-    </property>
-
-    <signal name="SignalQuality">
-      <tp:docstring>
-	The signal quality changed.
-      </tp:docstring>
-      <arg name="quality" type="u">
-	<tp:docstring>
-	  The new quality in percent, 0..100.
-	</tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="RegistrationInfo">
-      <tp:docstring>
-	The registration status changed.
-      </tp:docstring>
-      <arg name="status" type="u" tp:type="MM_MODEM_GSM_NETWORK_REG_STATUS">
-	<tp:docstring>
-          Mobile registration status as defined in 3GPP TS 27.007 section
-          10.1.19.
-	</tp:docstring>
-      </arg>
-      <arg name="operator_code" type="s">
-	<tp:docstring>
-          Current operator code of the operator to which the mobile is
-          currently registered.  Returned in the format "MCCMNC", where MCC
-          is the three-digit ITU E.212 Mobile Country Code and MNC is the
-          two- or three-digit GSM Mobile Network Code.  If the MCC and MNC
-          are not known or the mobile is not registered to a mobile network,
-          this value should be a zero-length (blank) string.  e.g. "31026" or
-          "310260".
-	</tp:docstring>
-      </arg>
-      <arg name="operator_name" type="s">
-	<tp:docstring>
-          Current operator name of the operator to which the mobile is
-          currently registered.  If the operator name is not knowon or the
-          mobile is not registered to a mobile network, this value should
-          be a zero-length (blank) string.
-	</tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="NetworkMode">
-      <tp:docstring>
-	The network mode preference changed. (DEPRECATED; see documentation
-	for GetNetworkMode/SetNetworkMode)
-      </tp:docstring>
-      <arg name="mode" type="u" tp:type="MM_MODEM_GSM_NETWORK_DEPRECATED_MODE">
-	<tp:docstring>The new network mode.</tp:docstring>
-      </arg>
-    </signal>
-
-    <tp:enum name="MM_MODEM_GSM_NETWORK_REG_STATUS" type="u">
-      <tp:docstring>
-        GSM registration code as defined in 3GPP TS 27.007 section 10.1.19.
-      </tp:docstring>
-      <tp:enumvalue suffix="IDLE" value="0">
-	<tp:docstring>
-	  Not registered, not searching for new operator to register.
-	</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="HOME" value="1">
-	<tp:docstring>
-	  Registered on home network.
-	</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SEARCHING" value="2">
-	<tp:docstring>
-	  Not registered, searching for new operator to register with.
-	</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DENIED" value="3">
-	<tp:docstring>
-	  Registration denied.
-	</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="UNKNOWN" value="4">
-	<tp:docstring>
-	  Unknown registration status.
-	</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ROAMING" value="5">
-	<tp:docstring>
-	  Registered on a roaming network.
-	</tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:enum name="MM_MODEM_GSM_NETWORK_DEPRECATED_MODE" type="u">
-      <tp:docstring>
-        DEPRECATED; should not be used in new applications.  Use
-        AccessTechnology, AllowedMode, and SetAllowedMode() instead.
-      </tp:docstring>
-      <tp:enumvalue suffix="ANY" value="0">
-	<tp:docstring>Any network mode can be used</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GPRS" value="1">
-	<tp:docstring>GPRS</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="EDGE" value="2">
-	<tp:docstring>EDGE</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="UMTS" value="3">
-	<tp:docstring>UMTS (3G)</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="HSDPA" value="4">
-	<tp:docstring>HSDPA</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="2G_PREFERRED" value="5">
-	<tp:docstring>Prefer 2G (GPRS or EDGE)</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="3G_PREFERRED" value="6">
-	<tp:docstring>Prefer 3G (UMTS/HSDPA/HSUPA/HSPA)</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="2G_ONLY" value="7">
-	<tp:docstring>Use only 2G (GPRS or EDGE)</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="3G_ONLY" value="8">
-	<tp:docstring>Use only 3G (UMTS/HSDPA/HSUPA/HSPA)</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="HSUPA" value="9">
-	<tp:docstring>HSUPA</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="HSPA" value="10">
-	<tp:docstring>HSPA (HSDPA + HSUPA)</tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml
deleted file mode 100644
index 9aa96de..0000000
--- a/introspection/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Gsm.SMS">
-    <method name="Delete">
-      <tp:docstring>
-	Delete an SMS message.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_sms_delete"/>
-      <arg name="index" type="u" direction="in">
-	<tp:docstring>
-	  The index of the SMS.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="Get">
-      <tp:docstring>
-	Retrieve an SMS from the SIM card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_sms_get"/>
-      <arg name="index" type="u" direction="in">
-	<tp:docstring>
-	  The index of the SMS.
-	</tp:docstring>
-      </arg>
-      <arg name="sms" type="a{sv}" direction="out">
-        <tp:docstring>
-          A dictionary containing SMS properties of the SMS specified by the given index.  This dictionary may contain the following key/value pairs:
-
-          number   : string - Phone number (mandatory)
-          text     : string - SMS text (mandatory, empty if data cannot be decoded)
-          data     : byte array - SMS user data (TP-UD) (mandatory)
-          data-coding-scheme: uint (0..255) - SMS user data coding scheme (TP-DCS) (mandatory)
-          smsc     : string - SMS service center number (optional)
-          class    : uint (0..3) - Message importance and location (optional)
-          completed: boolean - Whether all message parts have been received or not (optional)
-          index    : uint - Index of message (for Get and Delete) (optional)
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetFormat">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_sms_get_format"/>
-      <arg name="result" type="u" direction="out"/>
-    </method>
-
-    <method name="SetFormat">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_sms_set_format"/>
-      <arg name="format" type="u" direction="in"/>
-    </method>
-
-    <method name="GetSmsc">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_sms_get_smsc"/>
-      <arg name="result" type="s" direction="out"/>
-    </method>
-
-    <method name="SetSmsc">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_sms_set_smsc"/>
-      <arg name="smsc" type="s" direction="in"/>
-    </method>
-
-    <method name="List">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_sms_list"/>
-      <arg name="result" type="aa{sv}" direction="out"/>
-    </method>
-
-    <method name="Save">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_sms_save"/>
-      <arg name="properties" type="a{sv}" direction="in">
-        <tp:docstring>
-          SMS properties to save with the following key values:
-
-          number   : string - Phone number (mandatory)
-          text     : string - SMS text (mandatory)
-          smsc     : string - SMS service center number (optional)
-          relative-validity : uint - Minutes until the SMS expires in SMSC (optional)
-          class    : uint (0..3) - Message importance and location (optional)
-        </tp:docstring>
-      </arg>
-      <arg name="index" type="au" direction="out"/>
-    </method>
-
-    <method name="Send">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_sms_send"/>
-      <arg name="properties" type="a{sv}" direction="in">
-        <tp:docstring>
-          SMS properties to save with the following key values:
-
-          number   : string - Phone number (mandatory)
-          text     : string - SMS text (mandatory)
-          smsc     : string - SMS service center number (optional)
-          relative-validity : uint - Minutes until the SMS expires in SMSC (optional)
-          class    : uint (0..3) - Message importance and location (optional)
-        </tp:docstring>
-      </arg>
-      <arg name="result" type="au" direction="out"/>
-    </method>
-
-    <method name="SendFromStorage">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_sms_send_from_storage"/>
-      <arg name="index" type="u" direction="in"/>
-    </method>
-
-    <method name="SetIndication">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_sms_set_indication"/>
-      <arg name="mode" type="u" direction="in"/>
-      <arg name="mt" type="u" direction="in"/>
-      <arg name="bm" type="u" direction="in"/>
-      <arg name="ds" type="u" direction="in"/>
-      <arg name="bfr" type="u" direction="in"/>
-    </method>
-
-    <signal name="SmsReceived">
-      <tp:docstring>
-        Emitted when any part of a new SMS has been received (but not for subsequent parts, if any).  Not all parts may have been received and the message may not be complete; if it is, the 'complete' argument will be TRUE.
-      </tp:docstring>
-      <arg name="index" type="u">
-        <tp:docstring>
-          Index of the new SMS.
-        </tp:docstring>
-      </arg>
-      <arg name="complete" type="b">
-        <tp:docstring>
-          TRUE if all message parts have been received, otherwise FALSE.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="Completed">
-      <tp:docstring>
-        Emitted when the complete-ness status of an SMS message changes.  An SMS may not necessarily be complete when the first part is received; this signal will be emitted when all parts have been received, even for single-part messages.
-      </tp:docstring>
-      <arg name="index" type="u">
-        <tp:docstring>
-          The index of the SMS.
-        </tp:docstring>
-      </arg>
-      <arg name="completed" type="b">
-        <tp:docstring>
-          TRUE if all message parts have been received, otherwise FALSE.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml
deleted file mode 100644
index 8eef91d..0000000
--- a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-
-  <interface name="org.freedesktop.ModemManager.Modem.Gsm.Ussd">
-    <method name="Initiate">
-      <tp:docstring>
-        Sends a USSD command string to the network initiating a USSD session.
-        When the request is handled by the network, the method returns the
-        response or an appropriate error.  The network may be awaiting further
-        response from the ME after returning from this method and no new command
-        can be initiated until this one is cancelled or ended.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_gsm_ussd_initiate"/>
-      <arg name="command" type="s" direction="in">
-        <tp:docstring>
-          The command to start the USSD session with.
-        </tp:docstring>
-      </arg>
-      <arg name="reply" type="s" direction="out">
-        <tp:docstring>
-          The network response to the command which started the USSD session.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="Respond">
-      <tp:docstring>
-        Respond to a USSD request that is either initiated by the mobile network,
-        or that is awaiting further input after Initiate() was called.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_gsm_ussd_respond"/>
-      <arg name="response" type="s" direction="in">
-        <tp:docstring>
-          The response to network-initiated USSD command, or a response to a 
-          request for further input.
-      </tp:docstring>
-      </arg>
-      <arg name="reply" type="s" direction="out">
-        <tp:docstring>
-          The network reply to this response to the network-initiated USSD
-          command.  The reply may require further responses.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="Cancel">
-      <tp:docstring>
-        Cancel an ongoing USSD session, either mobile or network initiated.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_gsm_ussd_cancel"/>
-    </method>
-
-    <property name="State" type="s" access="read">
-      <tp:docstring>
-        Indicates the state of any ongoing USSD session.  Values may be one of
-        the following: "idle" (no active session), "active" (a session is active
-        and the mobile is waiting for a response), "user-response" (the network
-        is waiting for the client's response, which must be sent using Respond()).
-      </tp:docstring>
-    </property>
-
-    <property name="NetworkNotification" type="s" access="read">
-      <tp:docstring>
-        Contains any network-initiated request to which no USSD response is
-        required.  When no USSD session is active, or when there is no network-
-        initiated request, this property will be a zero-length string.
-      </tp:docstring>
-    </property>
-
-    <property name="NetworkRequest" type="s" access="read">
-      <tp:docstring>
-        Contains any pending network-initiated request for a response.  Client
-        should call Respond() with the appropriate response to this request.
-        When no USSD session is active, or when there is no pending
-        network-initiated request, this property will be a zero-length string.
-      </tp:docstring>
-    </property>
-
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Gsm.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.xml
deleted file mode 100644
index f3f6900..0000000
--- a/introspection/org.freedesktop.ModemManager.Modem.Gsm.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Gsm">
-    <tp:flags name="MM_MODEM_GSM_MODE" value-prefix="MM_MODEM_GSM_MODE" type="u">
-      <tp:docstring>
-        A bitfield describing the specifc access modes and technologies
-        supported by a device and the access technology in-use when connected to
-        a mobile network.
-      </tp:docstring>
-      <tp:flag suffix="UNKNOWN" value="0x0">
-        <tp:docstring>Unknown or invalid mode.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="ANY" value="0x1">
-        <tp:docstring>For certain operations, allow the modem to pick any available mode.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="GPRS" value="0x2">
-        <tp:docstring>GPRS</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="EDGE" value="0x4">
-        <tp:docstring>EDGE</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="UMTS" value="0x8">
-        <tp:docstring>UMTS (3G)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="HSDPA" value="0x10">
-        <tp:docstring>HSDPA (3G)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="2G_PREFERRED" value="0x20">
-        <tp:docstring>Prefer 2G (GPRS or EDGE)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="3G_PREFERRED" value="0x40">
-        <tp:docstring>Prefer 3G (UMTS/HSDPA/HSUPA/HSPA)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="2G_ONLY" value="0x80">
-        <tp:docstring>Use only 2G (GPRS or EDGE)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="3G_ONLY" value="0x100">
-        <tp:docstring>Use only 3G (UMTS/HSDPA/HSUPA/HSPA)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="HSUPA" value="0x200">
-        <tp:docstring>HSUPA (3G)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="HSPA" value="0x400">
-        <tp:docstring>HSPA (3G)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="GSM" value="0x800">
-        <tp:docstring>GSM</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="GSM_COMPACT" value="0x1000">
-        <tp:docstring>GSM Compact</tp:docstring>
-      </tp:flag>
-    </tp:flags>
-
-    <tp:flags name="MM_MODEM_GSM_BAND" value-prefix="MM_MODEM_GSM_BAND" type="u">
-      <tp:docstring>
-        A bitfield describing the specific radio bands supported by the device
-        and the radio bands the device is allowed to use when connecting to a
-        mobile network.
-      </tp:docstring>
-      <tp:flag suffix="UNKNOWN" value="0x0">
-        <tp:docstring>Unknown or invalid band</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="ANY" value="0x1">
-        <tp:docstring>For certain operations, allow the modem to select a band automatically.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="EGSM" value="0x2">
-        <tp:docstring>GSM/GPRS/EDGE 900 MHz</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="DCS" value="0x4">
-        <tp:docstring>GSM/GPRS/EDGE 1800 MHz</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="PCS" value="0x8">
-        <tp:docstring>GSM/GPRS/EDGE 1900 MHz</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="G850" value="0x10">
-        <tp:docstring>GSM/GPRS/EDGE 850 MHz</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="U2100" value="0x20">
-        <tp:docstring>WCDMA 2100 MHz (Class I)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="U1800" value="0x40">
-        <tp:docstring>WCDMA 3GPP 1800 MHz (Class III)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="U17IV" value="0x80">
-        <tp:docstring>WCDMA 3GPP AWS 1700/2100 MHz (Class IV)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="U800" value="0x100">
-        <tp:docstring>WCDMA 3GPP UMTS 800 MHz (Class VI)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="U850" value="0x200">
-        <tp:docstring>WCDMA 3GPP UMTS 850 MHz (Class V)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="U900" value="0x400">
-        <tp:docstring>WCDMA 3GPP UMTS 900 MHz (Class VIII)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="U17IX" value="0x800">
-        <tp:docstring>WCDMA 3GPP UMTS 1700 MHz (Class IX)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="U1900" value="0x1000">
-        <tp:docstring>WCDMA 3GPP UMTS 1900 MHz (Class II)</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="U2600" value="0x2000">
-        <tp:docstring>WCDMA 3GPP UMTS 2600 MHz (Class VII, internal)</tp:docstring>
-      </tp:flag>
-    </tp:flags>
-
-    <tp:enum name="MM_MODEM_GSM_ALLOWED_MODE" type="u">
-      <tp:docstring>
-        Describes the device's current access mode preference; ie the specific
-        technology preferences the device is allowed to use when connecting to
-        a mobile network.
-      </tp:docstring>
-      <tp:enumvalue suffix="ANY" value="0">
-	<tp:docstring>Any mode can be used</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="2G_PREFERRED" value="1">
-	<tp:docstring>Prefer 2G (GPRS or EDGE)</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="3G_PREFERRED" value="2">
-	<tp:docstring>Prefer 3G (UMTS or HSxPA)</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="2G_ONLY" value="3">
-	<tp:docstring>Use only 2G (GPRS or EDGE)</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="3G_ONLY" value="4">
-	<tp:docstring>Use only 3G (UMTS or HSxPA)</tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:enum name="MM_MODEM_GSM_ACCESS_TECH" type="u">
-      <tp:docstring>
-        Describes various access technologies that a device uses when connected
-        to a mobile network.
-      </tp:docstring>
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-	<tp:docstring>The access technology used is unknown</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM" value="1">
-	<tp:docstring>GSM</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GSM_COMPACT" value="2">
-	<tp:docstring>Compact GSM</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="GPRS" value="3">
-	<tp:docstring>GPRS</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="EDGE" value="4">
-	<tp:docstring>EDGE (ETSI 27.007: "GSM w/EGPRS")</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="UMTS" value="5">
-	<tp:docstring>UMTS (ETSI 27.007: "UTRAN")</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="HSDPA" value="6">
-	<tp:docstring>HSDPA (ETSI 27.007: "UTRAN w/HSDPA")</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="HSUPA" value="7">
-	<tp:docstring>HSUPA (ETSI 27.007: "UTRAN w/HSUPA")</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="HSPA" value="8">
-	<tp:docstring>HSPA (ETSI 27.007: "UTRAN w/HSDPA and HSUPA")</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="HSPA_PLUS" value="9">
-	<tp:docstring>HSPA+ (ETSI 27.007: "UTRAN w/HSPA+")</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="LTE" value="10">
-        <tp:docstring>LTE (ETSI 27.007: "E-UTRAN")</tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-  </interface>
-</node>
-
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Location.xml b/introspection/org.freedesktop.ModemManager.Modem.Location.xml
deleted file mode 100644
index d74f61c..0000000
--- a/introspection/org.freedesktop.ModemManager.Modem.Location.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Location">
-    <tp:docstring>
-      This interface allows devices to provide location information to client
-      applications.  Not all devices can provide this information, or even if
-      they do, they may not be able to provide it while a data session is
-      active.
-    </tp:docstring>
-
-    <property name="Capabilities" type="u" access="read" tp:type="MM_MODEM_LOCATION_CAPABILITIES">
-      <tp:docstring>
-        Location capabilities of the device.
-      </tp:docstring>
-    </property>
-
-    <property name="Enabled" type="b" access="read">
-      <tp:docstring>
-        TRUE if location information gathering is enabled for this device, FALSE
-        if it is disabled. When disabled, the device will not provide location
-        information.
-      </tp:docstring>
-    </property>
-
-    <method name="Enable">
-      <tp:docstring>
-	Enable or disable location information gathering.  This method may
-	require the client to authenticate itself.  This method may also cause
-	any necessary functionality of the mobile be be turned on, including
-	enabling the modem device itself.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_location_enable"/>
-      <arg name="enable" type="b" direction="in">
-	<tp:docstring>
-	  TRUE to enable location information gathering, FALSE to disable.
-	</tp:docstring>
-      </arg>
-      <arg name="signal_location" type="b" direction="in">
-	<tp:docstring>
-	  When enabling location information gathering, this argument controls
-	  whether the device emits signals with new location information or not.
-	  When signals are emitted, any client application (including malicious
-	  ones!) can listen for location updates unless D-Bus permissions
-	  restrict these signals from certain users.  If further security is
-	  desired, this argument can be set to FALSE to disable location
-	  updates via D-Bus signals and require applications to call
-	  authenticated APIs (like GetLocation) to get location information.
-	  This argument is ignored when disabling location information
-	  gathering.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetLocation">
-      <tp:docstring>
-        Return current location information, if any.  This method may require
-        the client to authenticate itself.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_location_get_location"/>
-      <arg name="Location" type="a{uv}" direction="out" tp:type="Location_Information_Map">
-        <tp:docstring>
-            Dict of available location information when location information
-            gathering is enabled.  If the modem supports multiple location types
-            it may return more than one here.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <property name="SignalsLocation" type="b" access="read">
-      <tp:docstring>
-        TRUE if location updates will be emitted via D-Bus signals, FALSE
-        if location updates will not be emitted.  See the Enable method for
-        more information.
-      </tp:docstring>
-    </property>
-
-    <property name="Location" type="a{uv}" access="read" tp:type="Location_Information_Map">
-      <tp:docstring>
-          Dict of available location information when location information
-          gathering is enabled.  If the modem supports multiple location types
-          it may return more than one here.  Note that if the device was told
-          not to emit updated location information when location information
-          gathering was initially enabled, this property may not return 
-          any location information for security reasons.
-      </tp:docstring>
-    </property>
-
-    <tp:mapping name="Location_Information_Map">
-      <tp:docstring>
-        A mapping from location type to type-specific location information.
-      </tp:docstring>
-      <tp:member type="u" name="Type" tp:type="MM_MODEM_LOCATION_CAPABILITIES">
-        <tp:docstring>
-          Identifies the type and format of the associated location information.
-          Contrary to the value description, this is not a bitfield but uses the
-          same values as the MM_MODEM_LOCATION_CAPABILITIES bitfield.
-        </tp:docstring>
-      </tp:member>
-      <tp:member type="v" name="Data">
-        <tp:docstring>
-          Contains type-specific location information.  See the documentation for
-          each type for a description of its data format.
-        </tp:docstring>
-      </tp:member>
-    </tp:mapping>
-
-    <tp:flags name="MM_MODEM_LOCATION_CAPABILITIES" value-prefix="MM_MODEM_LOCATION_CAPABILITY" type="u">
-      <tp:flag suffix="UNKNOWN" value="0x0">
-        <tp:docstring><p>Unknown or no capabilties.</p></tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="GPS_NMEA" value="0x1">
-        <tp:docstring>
-          <p>For capability reporting, indicates the device is capable of
-          providing GPS NMEA-format location information.</p>
-
-          <p>For location reporting, devices supporting this capability return
-          a string containing one or more NMEA sentences (D-Bus signature 's').
-          The manager will cache the most recent NMEA sentence of each type for
-          a period of time not less than 30 seconds.  When reporting multiple
-          NMEA sentences, sentences shall be separated by an ASCII Carriage
-          Return and Line Feed (&lt;CR&gt;&lt;LF&gt;) sequence.
-          </p>
-          <p>
-          For example, if the device sends a $GPRMC sentence immediately
-          followed by a $GPGGA sentence, the reported location string would be
-          (where of course the &lt;CR&gt;&lt;LF&gt; is replaced with the actual
-          ASCII CR (0x0D) and LF (0x0A) control characters):
-          <pre>
-          $GPRMC,134523.92,V,,,,,,,030136,,,N*73&lt;CR&gt;&lt;LF&gt;$GPGGA,,,,,,0,00,0.5,,M,0.0001999,M,0.0000099,0000*45
-          </pre>
-          If the device sends a new $GPRMC three seconds later, the new $GPRMC
-          replaces the previously received $GPRMC sentence, and the updated 
-          string would be:
-          <pre>
-          $GPRMC,134526.92,V,,,,,,,030136,,,N*76&lt;CR&gt;&lt;LF&gt;$GPGGA,,,,,,0,00,0.5,,M,0.0001999,M,0.0000099,0000*45
-          </pre>
-          If the device then sends a $GPGSA sentence about 5 seconds later, the
-          $GPGSA sentence is added to the string (since no $GPGSA sentence was
-          previously received in this session), the updated string would be:
-          <pre>
-          $GPRMC,134526.92,V,,,,,,,030136,,,N*76&lt;CR&gt;&lt;LF&gt;$GPGGA,,,,,,0,00,0.5,,M,0.0001999,M,0.0000099,0000*45&lt;CR&gt;&lt;LF&gt;$GPGSA,A,1,,,,,,,,,,,,,1.1,0.5,1.0*34
-          </pre>
-          The manager may discard any cached sentences older than 30 seconds.
-          </p>
-          <p>This allows clients to read the latest positioning data as soon as
-          possible after they start, even if the device is not providing
-          frequent location data updates.
-          </p>
-        </tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="GSM_LAC_CI" value="0x2">
-        <tp:docstring>
-          <p>For capability reporting, indicates the device is capable of
-          providing GSM Location Area Code/Cell ID location information.</p>
-
-          <p>For location reporting, devices supporting this
-          capability return a string in the format "MCC,MNC,LAC,CI" (without the
-          quotes of course) where the following applies:</p>
-          <ul>
-            <li>
-              MCC is the three-digit ITU E.212 Mobile Country Code of the
-              network provider to which the mobile is currently registered.
-              This value should be the same MCC as reported by the
-              org.freedesktop.Modem.Gsm.Network.GetRegistrationInfo() method's
-              returned "operator code" argument.
-              e.g. "310"
-            </li>
-            <li>
-              MNC is the two- or three-digit GSM Mobile Network Code of the
-              network provider to which the mobile is currently registered.
-              This value should be the same MCC as reported by the
-              org.freedesktop.Modem.Gsm.Network.GetRegistrationInfo() method's
-              returned "operator code" argument.
-              e.g. "26" or "260"
-            </li>
-            <li>
-              LAC is the two-byte Location Area Code of the base station with
-              which the mobile is registered, in upper-case hexadecimal format
-              without leading zeros, as specified in 3GPP TS 27.007 section
-              10.1.19.  e.g. "84CD".
-            </li>
-            <li>
-              CI is the two- or four-byte Cell Identifier with which the mobile
-              is registered, in upper-case hexadecimal format without leading
-              zeros, as specified in 3GPP TS 27.007.  e.g. "2BAF" or "D30156".
-            </li>
-          </ul>
-          <p>The entire string may only be composed of the ASCII digits [0-9], 
-          the alphabetical characters [A-F], and the comma (,) character.  No
-          other characters are allowed.  For example: "310,260,8BE3,2BAF" or
-          "250,40,CE00,1CEAD8F0".</p>
-
-          <p>If any of these four items (MCC,MNC,LAC,CI) is unknown or the
-          mobile is not registered with a network, then the GSM_LAC_CI location
-          information item should not be provided as a returned value from the
-          GetLocation() method or in the Location property.</p>
-        </tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="GPS_RAW" value="0x4">
-        <tp:docstring>
-          <p>For capability reporting, indicates the device is capable of
-          providing raw GPS information using a series of defined key/value
-          pairs.</p>
-
-          <p>For location reporting, devices supporting this
-          capability return a D-Bus dict (signature a{sv}) mapping well-known
-          keys to values with defined formats.  The allowed key/value pairs
-          and their formats are:</p>
-          <table>
-            <tr><th>Key</th><th>Value Type</th><th>Value contents</th><th>Example</th></tr>
-            <tr>
-              <td>latitude</td>
-              <td>d</td>
-              <td>Latitude in Decimal Degrees (positive numbers mean N quadrasphere, negative mean S quadrasphere)</td>
-              <td>38.889722 (ie, 38d 53' 22" N)</td>
-            </tr>
-            <tr>
-              <td>longitude</td>
-              <td>d</td>
-              <td>Longitude in Decimal Degrees (positive numbers mean E quadrasphere, negative mean W quadrasphere)</td>
-              <td>-77.008889 (ie, 77d 0' 32" W)</td>
-            </tr>
-            <tr>
-              <td>altitude</td>
-              <td>d</td>
-              <td>Altitude above sea level in meters</td>
-              <td>33.5</td>
-            </tr>
-            <tr>
-              <td>horiz-velocity</td>
-              <td>d</td>
-              <td>Horizontal velocity in meters-per-second</td>
-              <td>.5</td>
-            </tr>
-            <tr>
-              <td>vert-velocity</td>
-              <td>d</td>
-              <td>Vertical velocity in meters-per-second</td>
-              <td>.01</td>
-            </tr>
-          </table>
-          <p>The 'latitude' and 'longitude' keys are required; other keys are
-          optional.</p>
-        </tp:docstring>
-      </tp:flag>
-    </tp:flags>
-
-  </interface>
-</node>
-
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Simple.xml b/introspection/org.freedesktop.ModemManager.Modem.Simple.xml
deleted file mode 100644
index a86af4f..0000000
--- a/introspection/org.freedesktop.ModemManager.Modem.Simple.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Simple">
-
-    <method name="Connect">
-      <tp:docstring>
-	Do everything needed to connect the modem.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_simple_connect"/>
-      <arg name="properties" type="a{sv}" direction="in">
-	<tp:docstring>
-	  Dictionary of properties needed to get the modem connected.
-	  Each implementation is free to add it's own specific key-value pairs. The predefined
-	  common ones are:
-
-	  'pin'          : string
-	  'network_id'   : string (GSM/HSPA only)
-	  'band'         : uint
-	  'network_mode' : uint
-	  'apn'          : string (GSM/HSPA only)
-	  'number'       : string
-	  'rm-protocol'  : uint (CDMA/EVDO only) (1 - Relay, 2 - Network PPP)
-	</tp:docstring>
-      </arg>
-    </method>
-<!--
-    <method name="Disconnect">
-      <tp:docstring>
-	Disconnect modem.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_simple_disconnect"/>
-    </method>
--->
-    <method name="GetStatus">
-      <tp:docstring>
-	Get the modem status.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_simple_get_status"/>
-      <arg name="properties" type="a{sv}" direction="out">
-	<tp:docstring>
-	  Dictionary of properties.
-	  Each implementation is free to add it's own specific key-value pairs. The predefined
-	  common ones are:
-
-	  'state'          : uint (always)
-	  'signal_quality' : uint  (state >= registered)
-	  'operator_code'  : string (state >= registered)
-	  'operator_name'  : string (state >= registered)
-	  'band'           : uint (state >= registered)
-	  'network_mode'   : uint (state >= registered)
-	</tp:docstring>
-      </arg>
-    </method>
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager.Modem.xml b/introspection/org.freedesktop.ModemManager.Modem.xml
deleted file mode 100644
index 3f6f0bb..0000000
--- a/introspection/org.freedesktop.ModemManager.Modem.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-
-  <interface name="org.freedesktop.ModemManager.Modem">
-    <method name="Enable">
-      <tp:docstring>
-	Enable the device. Initializes the modem.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_enable"/>
-      <arg name="enable" type="b" direction="in">
-	<tp:docstring>
-	  True to enable the device, False to disable.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="Connect">
-      <tp:docstring>
-	Dial in.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_connect"/>
-      <arg name="number" type="s" direction="in">
-	<tp:docstring>
-	  The number to use for dialing.
-      </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="Disconnect">
-      <tp:docstring>
-	Disconnect modem.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_disconnect"/>
-    </method>
-
-    <method name="GetIP4Config">
-      <tp:docstring>
-	Request the IP4 configuration from the device.
-	Note that it'll only be supported for IPMethod MM_MODEM_IP_METHOD_STATIC.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_get_ip4_config"/>
-      <arg name="address" type="(uuuu)" direction="out">
-	Structure containing IP4 address, DNS1, DNS2, DNS3.
-	The DNS list is padded with 0's if there's less than 3 DNS servers.
-      </arg>
-    </method>
-
-    <method name="GetInfo">
-      <tp:docstring>
-        Get the card information (manufacturer, modem, version).
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_get_info"/>
-      <arg name="info" type="(sss)" direction="out">
-        <tp:docstring>
-          Structure containing manufacturer, model, and version (revision) of the card.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="Reset">
-      <tp:docstring>
-        Clear non-persistent configuration and state, and return the device to
-        a newly-powered-on state.  This command may power-cycle the device.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_reset"/>
-    </method>
-
-    <method name="FactoryReset">
-      <tp:docstring>
-        Clear the modem's configuration (including persistent configuration and
-        state), and return the device to a factory-default state. This command
-        may or may not power-cycle the device.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_factory_reset"/>
-      <arg name="code" type="s" direction="in">
-        Carrier-supplied code required to reset the modem.  Ignored if not required.
-      </arg>
-    </method>
-
-    <signal name="StateChanged">
-      <tp:docstring>
-        The modem's state (see the State property) changed.
-      </tp:docstring>
-      <arg name="old" type="u">
-        <tp:docstring>
-          Old state.
-        </tp:docstring>
-      </arg>
-      <arg name="new" type="u">
-        <tp:docstring>
-          New state.
-        </tp:docstring>
-      </arg>
-      <arg name="reason" type="u" tp:type="MM_MODEM_STATE_CHANGED_REASON">
-        <tp:docstring>
-          Reason for this state change.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <property name="Device" type="s" access="read">
-      <tp:docstring>
-	The modem port to use for IP configuration and traffic.
-      </tp:docstring>
-    </property>
-
-    <property name="DeviceIdentifier" type="s" access="read">
-      <tp:docstring>
-	A best-effort device identifier based on various device information like
-	model name, firmware revision, USB/PCI/PCMCIA IDs, and other properties.
-	This ID is not guaranteed to be unique and may be shared between
-	identical devices with the same firmware, but is intended to be
-	"unique enough" for use as a casual device identifier for various
-	user experience operations.  This is not the device's IMEI or ESN since
-	those may not be available before unlocking the device via a PIN.
-      </tp:docstring>
-    </property>
-
-    <property name="MasterDevice" type="s" access="read">
-      <tp:docstring>
-	The physical modem device reference (ie, USB, PCI, PCMCIA device), which
-	may be dependent upon the operating system.  In Linux for example, this
-	points to a sysfs path of the usb_device object.
-      </tp:docstring>
-    </property>
-
-    <property name="Driver" type="s" access="read">
-      <tp:docstring>
-        The driver handling the device.
-      </tp:docstring>
-    </property>
-
-    <property name="Type" type="u" access="read" tp:type="MM_MODEM_TYPE">
-      <tp:docstring>
-        The modem type.
-      </tp:docstring>
-    </property>
-
-    <property name="Enabled" type="b" access="read">
-      <tp:docstring>
-        TRUE if the modem is enabled (ie, powered and usable), FALSE if it is disabled.
-      </tp:docstring>
-    </property>
-
-    <property name="EquipmentIdentifier" type="s" access="read">
-      <tp:docstring>
-        The identity of the device. This will be the IMEI number for
-        GSM devices and the hex-format ESN/MEID for CDMA devices.
-      </tp:docstring>
-    </property>
-
-    <property name="UnlockRequired" type="s" access="read">
-      <tp:docstring>
-        Empty if the device is usable without an unlock code or has already
-        been unlocked. If the device needs to be unlocked before becoming usable this
-        property contains the specific unlock code required.  Valid unlock code values
-        are "" (blank), "sim-pin", "sim-puk", "ph-sim-pin", "ph-fsim-pin",
-        "ph-fsim-puk", "sim-pin2", "sim-puk2", "ph-net-pin", "ph-net-puk",
-        "ph-netsub-pin", "ph-netsub-puk", "ph-sp-pin", "ph-sp-puk", "ph-corp-pin", and
-        "ph-corp-puk".
-      </tp:docstring>
-    </property>
-
-    <property name="UnlockRetries" type="u" access="read">
-      <tp:docstring>
-        The number of unlock retries remaining for the unlock code given by the property UnlockRequired, or 999 if
-        the device does not support reporting unlock retries.
-      </tp:docstring>
-    </property>
-
-    <property name="IpMethod" type="u" access="read" tp:type="MM_MODEM_IP_METHOD">
-      <tp:docstring>
-        The IP configuration method.
-      </tp:docstring>
-    </property>
-
-    <!-- This ought to be of tp:type="MM_MODEM_STATE" but there are a couple
-         more wrinkles to be sorted out before we can export that here.
-         Also, Enabled should be folded into this. -->
-    <property name="State" type="u" access="read">
-      <tp:docstring>
-        State of the modem.
-      </tp:docstring>
-    </property>
-
-    <tp:enum name="MM_MODEM_TYPE" type="u">
-      <tp:enumvalue suffix="GSM" value="1">
-	<tp:docstring>
-	  A GSM device.
-	</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CDMA" value="2">
-	<tp:docstring>
-	  A CDMA device.
-	</tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:enum name="MM_MODEM_IP_METHOD" type="u">
-      <tp:enumvalue suffix="PPP" value="0">
-	<tp:docstring>
-	  Use PPP to get the address.
-	</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="STATIC" value="1">
-	<tp:docstring>
-	  Static configuration, the modem will provide IP information.
-	</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DHCP" value="2">
-	<tp:docstring>
-	  Use DHCP
-	</tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:enum name="MM_MODEM_STATE_CHANGED_REASON" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
-          Reason unknown or not reportable.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="USER_REQUESTED" value="1">
-        <tp:docstring>
-          State change was requested by an interface user.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SUSPEND" value="2">
-        <tp:docstring>
-          State change was caused by a system suspend.
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager.xml b/introspection/org.freedesktop.ModemManager.xml
deleted file mode 100644
index 0bc9fb2..0000000
--- a/introspection/org.freedesktop.ModemManager.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager">
-    <method name="EnumerateDevices">
-      <tp:docstring>
-        Get the list of modem devices.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_enumerate_devices"/>
-      <arg name="devices" type="ao" direction="out">
-	<tp:docstring>
-	  List of object paths of modem devices known to the system.
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="SetLogging">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_set_logging"/>
-      <tp:docstring>
-        Set logging verbosity.
-      </tp:docstring>
-      <arg name="level" type="s" direction="in">
-        <tp:docstring>
-          One of [ERR, WARN, INFO, DEBUG].
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <signal name="DeviceAdded">
-      <tp:docstring>
-	A device was added to the system.
-      </tp:docstring>
-      <arg name="device" type="o">
-	<tp:docstring>
-	  The object path of the newly added device.
-	</tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="DeviceRemoved">
-      <tp:docstring>
-	A device was removed from the system, and is no longer available.
-      </tp:docstring>
-      <arg name="device" type="o">
-	<tp:docstring>
-	  The object path of the device that was just removed.
-	</tp:docstring>
-      </arg>
-    </signal>
-
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Bearer.xml b/introspection/org.freedesktop.ModemManager1.Bearer.xml
new file mode 100644
index 0000000..e771a98
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Bearer.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2012 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011-2012 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Bearer:
+      @short_description: The ModemManager Bearer interface.
+
+      This interface provides access to specific actions that may be performed
+      on available bearers.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Bearer">
+
+    <!--
+        Connect:
+
+        Requests activation of a packet data connection with the network using
+        this bearer's properties. Upon successful activation, the modem can
+        send and receive packet data and, depending on the addressing
+        capability of the modem, a connection manager may need to start PPP,
+        perform DHCP, or assign the IP address returned by the modem to the
+        data interface. Upon successful return, the
+        #org.freedesktop.ModemManager1.Bearer:Ip4Config
+        and/or
+        #org.freedesktop.ModemManager1.Bearer:Ip6Config
+        properties become valid and may contain IP configuration information for
+        the data interface associated with this bearer.
+    -->
+    <method name="Connect" />
+
+    <!--
+        Disconnect:
+
+        Disconnect and deactivate this packet data connection.
+
+        Any ongoing data session will be terminated and IP addresses become
+        invalid when this method is called.
+    -->
+    <method name="Disconnect" />
+
+    <!--
+        For 3GPP (GSM/UMTS/LTE) technologies, Bearer objects represent only
+        Primary PDP contexts; Secondary contexts are not exposed as a concept
+        because they share everything with their parent primary PDP context
+        except QoS and traffic flows.  Instead, methods for setting QoS and
+        Traffic Flow Templates (TFTs) should be provided here which could as a
+        result of being called create secondary PDP contexts with those QoS and
+        TFT parameters.
+
+        FIXME: add methods to set QoS/TFT on the Bearer object, which should
+        create Secondary contexts if needed, and figure out some method of
+        disposing of those secondary contexts when no longer required.
+    -->
+
+    <!--
+        Interface:
+
+        The operating system name for the network data interface that provides
+        packet data using this bearer.
+
+        Connection managers must configure this interface depending on the IP
+        <literal>"method"</literal> given by the
+        #org.freedesktop.ModemManager1.Bearer:Ip4Config
+        or
+        #org.freedesktop.ModemManager1.Bearer:Ip6Config
+        properties set by bearer activation.
+
+        If <link linkend="MM-BEARER-IP-METHOD-STATIC:CAPS">MM_BEARER_IP_METHOD_STATIC</link>
+        or
+        <link linkend="MM-BEARER-IP-METHOD-DHCP:CAPS">MM_BEARER_IP_METHOD_DHCP</link>
+        methods are given, the interface
+        will be an ethernet-style inteface suitable for DHCP or setting static
+        IP configuration on, while if the
+        <link linkend="MM-BEARER-IP-METHOD-PPP:CAPS">MM_BEARER_IP_METHOD_PPP</link>
+        method is given, the interface
+        will be a serial TTY which must then have PPP run over it.
+    -->
+    <property name="Interface" type="s" access="read" />
+
+    <!--
+        Connected:
+
+        Indicates whether or not the bearer is connected and thus whether
+        packet data communication using this bearer is possible.
+    -->
+    <property name="Connected" type="b" access="read" />
+
+    <!--
+        Suspended:
+
+        In some devices, packet data service will be suspended while the device
+        is handling other communication, like a voice call. If packet data
+        service is suspended (but not deactivated) this property will be %TRUE.
+    -->
+    <property name="Suspended" type="b" access="read" />
+
+    <!--
+        Ip4Config:
+
+        If the bearer was configured for IPv4 addressing, upon activation this
+        property contains the addressing details for assignment to the data
+        interface.
+
+        Mandatory items include:
+        <variablelist>
+          <varlistentry><term><literal>"method"</literal></term>
+            <listitem>
+              A <link linkend="MMBearerIpMethod">MMBearerIpMethod</link>,
+              given as an unsigned integer value (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+        </variablelist>
+
+        If the bearer specifies configuration via PPP or DHCP, only the
+        <literal>"method"</literal> item will be present.
+
+        Additional items which are only applicable when using the
+        <link linkend="MM-BEARER-IP-METHOD-STATIC:CAPS">MM_BEARER_IP_METHOD_STATIC</link>
+        method are:
+        <variablelist>
+          <varlistentry><term><literal>"address"</literal></term>
+            <listitem>
+              IP address, given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"prefix"</literal></term>
+            <listitem>
+              Numeric CIDR network prefix (ie, 24, 32, etc), give as an unsigned integer value (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"dns1"</literal></term>
+            <listitem>
+              IP address of the first DNS server, given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"dns2"</literal></term>
+            <listitem>
+              IP address of the second DNS server, given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"dns3"</literal></term>
+            <listitem>
+              IP address of the third DNS server, given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"gateway"</literal></term>
+            <listitem>
+              IP address of the default gateway, given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <property name="Ip4Config" type="a{sv}" access="read" />
+
+    <!--
+        Ip6Config:
+
+        If the bearer was configured for IPv6 addressing, upon activation this
+        property contains the addressing details for assignment to the data
+        interface.
+
+        Mandatory items include:
+        <variablelist>
+          <varlistentry><term><literal>"method"</literal></term>
+            <listitem>
+              A <link linkend="MMBearerIpMethod">MMBearerIpMethod</link>,
+              given as an unsigned integer value (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+        </variablelist>
+
+        If the bearer specifies configuration via PPP or DHCP, only the
+        <literal>"method"</literal> item will be present.
+
+        Additional items which are only applicable when using the
+        <link linkend="MM-BEARER-IP-METHOD-STATIC:CAPS">MM_BEARER_IP_METHOD_STATIC</link>
+        method are:
+        <variablelist>
+          <varlistentry><term><literal>"address"</literal></term>
+            <listitem>
+              IP address, given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"prefix"</literal></term>
+            <listitem>
+              Numeric CIDR network prefix (ie, 24, 32, etc), give as an unsigned integer value (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"dns1"</literal></term>
+            <listitem>
+              IP address of the first DNS server, given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"dns2"</literal></term>
+            <listitem>
+              IP address of the second DNS server, given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"dns3"</literal></term>
+            <listitem>
+              IP address of the third DNS server, given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"gateway"</literal></term>
+            <listitem>
+              IP address of the default gateway, given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <property name="Ip6Config" type="a{sv}" access="read" />
+
+    <!--
+        IpTimeout:
+
+        Maximum time to wait for a successful IP establishment, when PPP is used.
+    -->
+    <property name="IpTimeout" type="u" access="read" />
+
+    <!--
+        Properties:
+
+        List of properties used when creating the bearer.
+    -->
+    <property name="Properties" type="a{sv}" access="read" />
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Contacts.xml b/introspection/org.freedesktop.ModemManager1.Modem.Contacts.xml
new file mode 100644
index 0000000..da681b4
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.Contacts.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem.Contacts:
+      @short_description: The ModemManager Contacts interface.
+
+      This interface provides access to contacts stored in various locations,
+      including SIM cards, device storage, and other locations. Operations
+      generally operate on all contacts regardless of their actual storage
+      location.
+
+      Contacts are referred to by index numbers, which are internal to
+      ModemManager and do not represent indexes of SIM cards or the device.
+      Indexes may not be contiguous.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem.Contacts">
+
+    <!--
+        Add:
+        @properties: Dictionary of properties describing the contact.
+        @index: The index number of the new contact
+
+        Add a new contact.
+
+        If any of the property in @properties exceeds the modem's size limit,
+        that property will be truncated to fit.
+
+        Known properties are:
+        <variablelist>
+          <varlistentry><term><literal>"name"</literal></term>
+            <listitem>
+              Full name of the contact, given as a string value
+              (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"number"</literal></term>
+            <listitem>
+              Telephone number, given as a string value
+              (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"email"</literal></term>
+            <listitem>
+              Email address, given as a string value
+              (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"group"</literal></term>
+            <listitem>
+              Group this contact belongs to, given as a string value
+              (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"name2"</literal></term>
+            <listitem>
+              Additional contact name, given as a string value
+              (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"number2"</literal></term>
+            <listitem>
+              Additional contact telephone number, given as a string value
+              (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"hidden"</literal></term>
+            <listitem>
+              Boolean flag to specify whether this entry is hidden or not,
+              (signature <literal>"b"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"storage"</literal></term>
+            <listitem>
+              Phonebook in which the contact is stored, given as a
+              <link linkend="MMModemContactsStorage">MMModemContactsStorage</link>,
+              (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+        </variablelist>
+
+        The @index number is an internal private number to ModemManager and does
+        not correspond to the index of the contact in the modem or SIM itself.
+    -->
+    <method name="Add">
+      <arg name="properties" type="a{sv}" direction="in"  />
+      <arg name="index"      type="u"     direction="out" />
+    </method>
+
+    <!--
+        Delete:
+        @index: The index of the contact to delete.
+
+        Delete a contact.
+    -->
+    <method name="Delete">
+      <arg name="index" type="u" direction="in" />
+    </method>
+
+    <!--
+        Get:
+        @index: The index of the contact.
+        @properties: The properties of the contact.
+
+        Retrieve a contact.
+    -->
+    <method name="Get">
+      <arg name="index"      type="u"     direction="in"  />
+      <arg name="properties" type="a{sv}" direction="out" />
+    </method>
+
+    <!--
+        List:
+        @results: An array of dictionaries, each dictionary representing a contact.
+
+        List all contacts.
+    -->
+    <method name="List">
+      <arg name="results" type="aa{sv}" direction="out" />
+    </method>
+
+    <!--
+        Find:
+        @pattern: The pattern to search for.
+        @results: An array of dictionaries, each dictionary representing a contact.
+
+        Find a contact.
+    -->
+    <method name="Find">
+      <arg name="pattern" type="s"      direction="in"  />
+      <arg name="results" type="aa{sv}" direction="out" />
+    </method>
+
+    <!--
+        GetCount:
+        @count: The number of contacts.
+
+        Get the number of contacts.
+    -->
+    <method name="GetCount">
+      <arg name="count" type="u" direction="out" />
+    </method>
+
+    <!--
+        Added:
+        @index: The index number of the new contact.
+        @properties: The properties of the contact.
+
+        Emitted when a new contact is added.
+    -->
+    <signal name="Added">
+      <arg name="index"      type="u"     />
+      <arg name="properties" type="a{sv}" />
+    </signal>
+
+    <!--
+        Deleted:
+        @index: The index number of the now deleted contact.
+
+        Emitted when a new contact has been deleted.
+    -->
+    <signal name="Deleted">
+      <arg name="index" type="u" />
+    </signal>
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Firmware.xml b/introspection/org.freedesktop.ModemManager1.Modem.Firmware.xml
new file mode 100644
index 0000000..c191213
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.Firmware.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem.Firmware:
+      @short_description: The ModemManager Firmware interface.
+
+      This interface allows clients to select or install firmware images on
+      modems.
+
+      Firmware slots and firmware images are identified by arbitrary opaque
+      strings.
+
+      Firmware images are represented as dictionaries of properties.
+      Certain properties are pre-defined, and some are required:
+
+      <variablelist>
+        <varlistentry><term><literal>"image-type"</literal></term>
+          <listitem>
+            (Required) Type of the firmware image, given as a
+            <link linkend="MMFirmwareImageType">MMFirmwareImageType</link> value
+            (signature <literal>"u"</literal>). Firmware images of type
+            <link linkend="MM-FIRMWARE-IMAGE-TYPE-GENERIC:CAPS">MM_FIRMWARE_IMAGE_TYPE_GENERIC</link>
+            will only expose only the mandatory properties.
+          </listitem>
+        </varlistentry>
+        <varlistentry><term><literal>"unique-id"</literal></term>
+          <listitem>
+            (Required) A user-readable unique ID for the firmware image, given as a
+            string value (signature <literal>"s"</literal>).
+          </listitem>
+        </varlistentry>
+        <varlistentry><term><literal>"gobi-pri-version"</literal></term>
+          <listitem>
+            (Optional) The version of the PRI firmware image, in images of type
+            <link linkend="MM-FIRMWARE-IMAGE-TYPE-GOBI:CAPS">MM_FIRMWARE_IMAGE_TYPE_GOBI</link>,
+            given as a string value (signature <literal>"s"</literal>).
+          </listitem>
+        </varlistentry>
+        <varlistentry><term><literal>"gobi-pri-info"</literal></term>
+          <listitem>
+            (Optional) Additional information of the PRI image, in images of type
+            <link linkend="MM-FIRMWARE-IMAGE-TYPE-GOBI:CAPS">MM_FIRMWARE_IMAGE_TYPE_GOBI</link>,
+            given as a string value (signature <literal>"s"</literal>).
+          </listitem>
+        </varlistentry>
+        <varlistentry><term><literal>"gobi-boot-version"</literal></term>
+          <listitem>
+            (Optional) The boot version of the PRI firmware image, in images of type
+            <link linkend="MM-FIRMWARE-IMAGE-TYPE-GOBI:CAPS">MM_FIRMWARE_IMAGE_TYPE_GOBI</link>,
+            given as a string value (signature <literal>"s"</literal>).
+          </listitem>
+        </varlistentry>
+        <varlistentry><term><literal>"gobi-pri-unique-id"</literal></term>
+          <listitem>
+            (Optional) The unique ID of the PRI firmware image, in images of type
+            <link linkend="MM-FIRMWARE-IMAGE-TYPE-GOBI:CAPS">MM_FIRMWARE_IMAGE_TYPE_GOBI</link>,
+            given as a string value (signature <literal>"s"</literal>).
+          </listitem>
+        </varlistentry>
+        <varlistentry><term><literal>"gobi-modem-unique-id"</literal></term>
+          <listitem>
+            (Optional) The unique ID of the Modem firmware image, in images of type
+            <link linkend="MM-FIRMWARE-IMAGE-TYPE-GOBI:CAPS">MM_FIRMWARE_IMAGE_TYPE_GOBI</link>,
+            given as a string value (signature <literal>"s"</literal>).
+          </listitem>
+        </varlistentry>
+      </variablelist>
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem.Firmware">
+
+    <!--
+        List:
+        @selected: The unique name of the selected firmware image, or the empty string if no image is selected.
+        @installed: An array of dictionaries containing the properties of the installed firmware images.
+
+        List installed firmware images.
+
+        Depending on the type of modem, installed images may be stored on the
+        host or the modem.
+
+        Installed images can be selected non-destructively.
+    -->
+    <method name="List">
+      <arg name="selected"  type="s"        direction="out" />
+      <arg name="installed" type="aa{sv}" direction="out" />
+    </method>
+
+    <!--
+        Select:
+        @uniqueid: The unique ID of the firmware image to select.
+
+        Selects a different firmware image to use, and immediately resets the
+        modem so that it begins using the new firmware image.
+
+        The method will fail if the identifier does not match any of the names
+        returned by
+        <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-Firmware.List">List()</link>,
+        or if the image could not be selected for some reason.
+    -->
+    <method name="Select">
+      <arg name="uniqueid" type="s" direction="in" />
+    </method>
+
+    <!--
+        Install:
+        @image: The identifier of the firmware image to install.
+        @slot: The identifier of the slot into which the firmware should be installed.
+
+        Install an available firmware image into a slot.
+
+        It does not guarantee that the image will be installed into the
+        specified slot, but does guarantee that, if the slot is empty, no
+        image will be overwritten, and if the slot is not empty, no image
+        other than the one in that slot will be overwritten.
+
+        The method will fail if either of the identifiers is invalid, or if the
+        image could not be installed into the slot for some reason.
+
+    <method name="Install">
+      <arg name="image" type="s" direction="in" />
+      <arg name="slot"  type="s" direction="in" />
+    </method-->
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Location.xml b/introspection/org.freedesktop.ModemManager1.Modem.Location.xml
new file mode 100644
index 0000000..a23ec75
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.Location.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem.Location:
+      @short_description: The ModemManager Location interface.
+
+      The Location interface allows devices to provide location information to
+      client applications. Not all devices can provide this information, or even
+      if they do, they may not be able to provide it while a data session is
+      active.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem.Location">
+
+    <!--
+        Setup:
+        @sources: Bitmask of <link linkend="MMModemLocationSource">MMModemLocationSource</link> flags, specifying which sources should get enabled or disabled. <link linkend="MM-MODEM-LOCATION-SOURCE-NONE:CAPS">MM_MODEM_LOCATION_SOURCE_NONE</link> will disable all location gathering.
+        @signal_location: Flag to control whether the device emits signals with the new location information. This argument is ignored when disabling location information gathering.
+
+        Configure the location sources to use when gathering location
+        information. Also enable or disable location information gathering.
+        This method may require the client to authenticate itself.
+
+        When signals are emitted, any client application (including malicious
+        ones!) can listen for location updates unless D-Bus permissions restrict
+        these signals from certain users. If further security is desired, the
+        @signal_location argument can be set to %FALSE to disable location
+        updates via D-Bus signals and require applications to call
+        authenticated APIs (like
+        <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-Location.GetLocation">GetLocation()</link>
+        ) to get
+        location information.
+    -->
+    <method name="Setup">
+      <arg name="sources"         type="u" direction="in" />
+      <arg name="signal_location" type="b" direction="in" />
+    </method>
+
+    <!--
+        GetLocation:
+        @location: Dictionary of available location information when location information gathering is enabled.
+
+        Return current location information, if any. If the modem supports
+        multiple location types it may return more than one. See the
+        #org.freedesktop.ModemManager1.Modem.Location:Location property
+        for more information on the dictionary returned at @location.
+
+        This method may require the client to authenticate itself.
+    -->
+    <method name="GetLocation">
+      <arg name="Location" type="a{uv}" direction="out" />
+    </method>
+
+    <!--
+        Capabilities:
+
+        Bitmask of <link linkend="MMModemLocationSource">MMModemLocationSource</link>
+        values, specifying the supported location sources.
+    -->
+    <property name="Capabilities" type="u" access="read" />
+
+    <!--
+        Enabled:
+
+        Bitmask specifying which of the supported
+        <link linkend="MMModemLocationSource">MMModemLocationSource</link>
+        location sources is currently enabled in the device.
+    -->
+    <property name="Enabled" type="u" access="read" />
+
+    <!--
+        SignalsLocation:
+
+        %TRUE if location updates will be emitted via D-Bus signals, %FALSE if
+        location updates will not be emitted.
+
+        See the
+        <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-Location.Setup">Setup()</link>
+        method for more information.
+    -->
+    <property name="SignalsLocation" type="b" access="read" />
+
+    <!--
+        Location:
+
+        Dictionary of available location information when location information
+        gathering is enabled. If the modem supports multiple location types it
+        may return more than one here.
+
+        Note that if the device was told not to emit updated location
+        information when location information gathering was initially enabled,
+        this property may not return any location information for security reasons.
+
+        This dictionary is composed of a
+        <link linkend="MMModemLocationSource">MMModemLocationSource</link>
+        key, with an associated data which contains type-specific location
+        information:
+
+        <variablelist>
+        <varlistentry><term><link linkend="MM-MODEM-LOCATION-SOURCE-3GPP-LAC-CI:CAPS">MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI</link></term>
+          <listitem>
+            <para>
+              Devices supporting this
+              capability return a string in the format <literal>"MCC,MNC,LAC,CI"</literal> (without the
+              quotes of course) where the following applies:
+            </para>
+            <variablelist>
+              <varlistentry><term><literal>MCC</literal></term>
+                <listitem>
+                  This is the three-digit ITU E.212 Mobile Country Code of the
+                  network provider to which the mobile is currently registered.
+                  e.g. <literal>"310"</literal>.
+                </listitem>
+              </varlistentry>
+              <varlistentry><term><literal>MNC</literal></term>
+                <listitem>
+                  This is the two- or three-digit GSM Mobile Network Code of the
+                  network provider to which the mobile is currently registered.
+                  e.g. <literal>"26"</literal> or <literal>"260"</literal>.
+                </listitem>
+              </varlistentry>
+              <varlistentry><term><literal>LAC</literal></term>
+                <listitem>
+                  This is the two-byte Location Area Code of the base station with
+                  which the mobile is registered, in upper-case hexadecimal format
+                  without leading zeros, as specified in 3GPP TS 27.007 section
+                  10.1.19. e.g. <literal>"84CD"</literal>.
+                </listitem>
+              </varlistentry>
+              <varlistentry><term><literal>CI</literal></term>
+                <listitem>
+                  This is the two- or four-byte Cell Identifier with which the mobile
+                  is registered, in upper-case hexadecimal format without leading
+                  zeros, as specified in 3GPP TS 27.007.
+                  e.g. <literal>"2BAF"</literal> or <literal>"D30156"</literal>.
+                </listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              The entire string may only be composed of the ASCII digits <literal>[0-9]</literal>,
+              the alphabetical characters <literal>[A-F]</literal>, and the comma (<literal>,</literal>) character.
+              No other characters are allowed.  For example: <literal>"310,260,8BE3,2BAF"</literal> or
+              <literal>"250,40,CE00,1CEAD8F0"</literal>.
+            </para>
+            <para>
+              If any of these four items (<literal>MCC</literal>, <literal>MNC</literal>,
+              <literal>LAC</literal>, <literal>CI</literal>) is unknown or the
+              mobile is not registered with a network, then the
+              <link linkend="MM-MODEM-LOCATION-SOURCE-3GPP-LAC-CI:CAPS">MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI</link>
+              location
+              information item should not be provided as a returned value from the
+              <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-Location.GetLocation">GetLocation()</link>
+              method or in the #org.freedesktop.ModemManager1.Modem.Location:Location property.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry><term><link linkend="MM-MODEM-LOCATION-SOURCE-GPS-RAW:CAPS">MM_MODEM_LOCATION_SOURCE_GPS_RAW</link></term>
+          <listitem>
+            <para>
+              Devices supporting this
+              capability return a D-Bus dictionary (signature <literal>"a{sv}"</literal>) mapping well-known
+              keys to values with defined formats.
+            </para>
+            <para>
+              The allowed key/value pairs and their formats are:
+            </para>
+            <variablelist>
+              <varlistentry><term><literal>"utc-time"</literal></term>
+                <listitem>
+                  (Required) UTC time in ISO 8601 format, given as a string value (signature <literal>"s"</literal>). e.g. <literal>203015</literal>.
+                </listitem>
+              </varlistentry>
+              <varlistentry><term><literal>"latitude"</literal></term>
+                <listitem>
+                  (Required) Latitude in Decimal Degrees (positive numbers mean N quadrasphere, negative mean S quadrasphere), given as a double value (signature <literal>"d"</literal>). e.g. <literal>38.889722</literal>, meaning 38d 53' 22" N.
+                </listitem>
+              </varlistentry>
+              <varlistentry><term><literal>"longitude"</literal></term>
+                <listitem>
+                  (Required) Longitude in Decimal Degrees (positive numbers mean E quadrasphere, negative mean W quadrasphere), given as a double value (signature <literal>"d"</literal>). e.g. <literal>-77.008889</literal>, meaning 77d 0' 32" W.
+                </listitem>
+              </varlistentry>
+              <varlistentry><term><literal>"altitude"</literal></term>
+                <listitem>
+                  (Optional) Altitude above sea level in meters, given as a double value (signature <literal>"d"</literal>). e.g. <literal>33.5</literal>.
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+        <varlistentry><term><link linkend="MM-MODEM-LOCATION-SOURCE-GPS-NMEA:CAPS">MM_MODEM_LOCATION_SOURCE_GPS_NMEA</link></term>
+          <listitem>
+            <para>
+              Devices supporting this capability return
+              a string containing one or more NMEA sentences (D-Bus signature <literal>'s'</literal>).
+              The manager will cache the most recent NMEA sentence of each type for
+              a period of time not less than 30 seconds.  When reporting multiple
+              NMEA sentences, sentences shall be separated by an ASCII Carriage
+              Return and Line Feed (<literal>&lt;CR&gt;&lt;LF&gt;</literal>) sequence.
+            </para>
+            <para>
+              For example, if the device sends a <literal>$GPRMC</literal> sentence immediately
+              followed by a <literal>$GPGGA</literal> sentence, the reported location string would be
+              (where of course the <literal>&lt;CR&gt;&lt;LF&gt;</literal> is replaced with the actual
+              ASCII <literal>CR</literal> (0x0D) and <literal>LF</literal> (0x0A) control characters):
+              <para><literal>
+                $GPRMC,134523.92,V,,,,,,,030136,,,N*73&lt;CR&gt;&lt;LF&gt;$GPGGA,,,,,,0,00,0.5,,M,0.0001999,M,0.0000099,0000*45
+              </literal></para>
+              If the device sends a new <literal>$GPRMC</literal> three seconds later, the new <literal>$GPRMC</literal>
+              replaces the previously received <literal>$GPRMC</literal> sentence, and the updated
+              string would be:
+              <para><literal>
+                $GPRMC,134526.92,V,,,,,,,030136,,,N*76&lt;CR&gt;&lt;LF&gt;$GPGGA,,,,,,0,00,0.5,,M,0.0001999,M,0.0000099,0000*45
+              </literal></para>
+              If the device then sends a <literal>$GPGSA</literal> sentence about 5 seconds later, the
+              <literal>$GPGSA</literal> sentence is added to the string (since no <literal>$GPGSA</literal> sentence was
+              obviously received in this session), the updated string would be:
+              <para><literal>
+                $GPRMC,134526.92,V,,,,,,,030136,,,N*76&lt;CR&gt;&lt;LF&gt;$GPGGA,,,,,,0,00,0.5,,M,0.0001999,M,0.0000099,0000*45&lt;CR&gt;&lt;LF&gt;$GPGSA,A,1,,,,,,,,,,,,,1.1,0.5,1.0*34
+              </literal></para>
+              The manager may discard any cached sentences older than 30 seconds.
+            </para>
+            <para>
+              This allows clients to read the latest positioning data as soon as
+              possible after they start, even if the device is not providing
+              frequent location data updates.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry><term><link linkend="MM-MODEM-LOCATION-SOURCE-CDMA-BS:CAPS">MM_MODEM_LOCATION_SOURCE_CDMA_BS</link></term>
+          <listitem>
+            <para>
+              Devices supporting this
+              capability return a D-Bus dictionary (signature <literal>"a{sv}"</literal>) mapping well-known
+              keys to values with defined formats.
+            </para>
+            <para>
+              The allowed key/value pairs and their formats are:
+            </para>
+            <variablelist>
+              <varlistentry><term><literal>"latitude"</literal></term>
+                <listitem>
+                  (Required) Latitude in Decimal Degrees (positive numbers mean N quadrasphere, negative mean S quadrasphere), given as a double value (signature <literal>"d"</literal>). e.g. <literal>38.889722</literal>, meaning 38d 53' 22" N.
+                </listitem>
+              </varlistentry>
+              <varlistentry><term><literal>"longitude"</literal></term>
+                <listitem>
+                  (Required) Longitude in Decimal Degrees (positive numbers mean E quadrasphere, negative mean W quadrasphere), given as a double value (signature <literal>"d"</literal>). e.g. <literal>-77.008889</literal>, meaning 77d 0' 32" W.
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+        </variablelist>
+    -->
+    <property name="Location" type="a{uv}" access="read" />
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Messaging.xml b/introspection/org.freedesktop.ModemManager1.Modem.Messaging.xml
new file mode 100644
index 0000000..0408039
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.Messaging.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem.Messaging:
+      @short_description: The ModemManager Messaging interface.
+
+      The Messaging interface handles sending SMS messages and notification of new
+      incoming messages.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem.Messaging">
+
+    <!--
+        List:
+        @result: The list of SMS object paths.
+
+        Retrieve all SMS messages.
+
+        This method should only be used once and subsequent information
+        retreived either by listening for the
+        #org.freedesktop.ModemManager1.Modem.Messaging::Added and
+        #org.freedesktop.ModemManager1.Modem.Messaging::Completed signals,
+        or by querying the specific SMS object of interest.
+    -->
+    <method name="List">
+      <arg name="result" type="ao" direction="out" />
+    </method>
+
+    <!--
+        Delete:
+        @path: The object path of the SMS to delete.
+
+        Delete an SMS message.
+    -->
+    <method name="Delete">
+      <arg name="path" type="o" direction="in" />
+    </method>
+
+    <!--
+        Create:
+        @properties: Message properties from the <link linkend="gdbus-org.freedesktop.ModemManager1.Sms">SMS D-Bus interface</link>.
+        @path: The object path of the new message object.
+
+        Creates a new message object.
+
+        The '<link linkend="gdbus-property-org-freedesktop-ModemManager1-Sms.Number">Number</link>'
+        and
+        either '<link linkend="gdbus-property-org-freedesktop-ModemManager1-Sms.Text">Text</link>' or
+        '<link linkend="gdbus-property-org-freedesktop-ModemManager1-Sms.Data">Data</link>'
+        properties are mandatory, others are optional.
+
+        If the SMSC is not specified and one is required, the default SMSC is
+        used.
+    -->
+    <method name="Create">
+      <arg name="properties" type="a{sv}" direction="in"  />
+      <arg name="path"       type="o"     direction="out" />
+    </method>
+
+    <!--
+        Added:
+        @path: Object path of the new SMS.
+        @received: %TRUE if the message was received from the network, as opposed to being added locally.
+
+        Emitted when any part of a new SMS has been received or added (but not
+        for subsequent parts, if any). For messages received from the network,
+        not all parts may have been received and the message may not be
+        complete.
+
+        Check the
+        '<link linkend="gdbus-property-org-freedesktop-ModemManager1-Sms.State">State</link>'
+        property to determine if the message is complete. The
+        #org.freedesktop.ModemManager1.Modem.Messaging::Completed
+        signal will also be emitted when the message is complete.
+    -->
+    <signal name="Added">
+      <arg name="path" type="o" />
+      <arg name="received" type="b" />
+    </signal>
+
+    <!--
+        Deleted:
+        @path: Object path of the now deleted SMS.
+
+        Emitted when a message has been deleted.
+    -->
+    <signal name="Deleted">
+      <arg name="path" type="o" />
+    </signal>
+
+    <!--
+        SupportedStorages:
+
+        A list of <link linkend="MMSmsStorage">MMSmsStorage</link> values,
+        specifying the storages supported by this modem for storing and
+        receiving SMS.
+    -->
+    <property name="SupportedStorages" type="au" access="read" />
+
+    <!--
+        DefaultStorage:
+
+        A <link linkend="MMSmsStorage">MMSmsStorage</link> value,
+        specifying the storage to be used when receiving or storing SMS.
+    -->
+    <property name="DefaultStorage" type="u" access="read" />
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml b/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml
new file mode 100644
index 0000000..c4d3658
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd:
+      @short_description: The ModemManager 3GPP USSD interface.
+
+      This interface provides access to actions based on the USSD protocol.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd">
+
+    <!--
+        Initiate:
+        @command: The command to start the USSD session with.
+        @reply: The network response to the command which started the USSD session.
+
+        Sends a USSD command string to the network initiating a USSD session.
+
+        When the request is handled by the network, the method returns the
+        response or an appropriate error. The network may be awaiting further
+        response from the ME after returning from this method and no new command
+        can be initiated until this one is cancelled or ended.
+    -->
+    <method name="Initiate">
+      <arg name="command" type="s" direction="in"  />
+      <arg name="reply"   type="s" direction="out" />
+    </method>
+
+    <!--
+        Respond:
+        @response: The response to network-initiated USSD command, or a response to a request for further input.
+        @reply: The network reply to this response to the network-initiated USSD command. The reply may require further responses.
+
+        Respond to a USSD request that is either initiated by the mobile network,
+        or that is awaiting further input after
+        <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-Modem3gpp-Ussd.Initiate">Initiate()</link>
+        was called.
+    -->
+    <method name="Respond">
+      <arg name="response" type="s" direction="in"  />
+      <arg name="reply"    type="s" direction="out" />
+    </method>
+
+    <!--
+        Cancel:
+
+        Cancel an ongoing USSD session, either mobile or network initiated.
+    -->
+    <method name="Cancel" />
+
+    <!--
+        State:
+
+        A <link linkend="MMModem3gppUssdSessionState">MMModem3gppUssdSessionState</link> value,
+        indicating the state of any ongoing USSD session.
+    -->
+    <property name="State" type="u" access="read" />
+
+    <!--
+        NetworkNotification:
+
+        Contains any network-initiated request to which no USSD response is
+        required.
+
+        When no USSD session is active, or when there is no network-
+        initiated request, this property will be a zero-length string.
+    -->
+    <property name="NetworkNotification" type="s" access="read" />
+
+    <!--
+        NetworkRequest:
+
+        Contains any pending network-initiated request for a response. Client
+        should call
+        <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-Modem3gpp-Ussd.Respond">Respond()</link>
+        with the appropriate response to this request.
+
+        When no USSD session is active, or when there is no pending
+        network-initiated request, this property will be a zero-length string.
+    -->
+    <property name="NetworkRequest" type="s" access="read" />
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml b/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml
new file mode 100644
index 0000000..50ab2fd
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem.Modem3gpp:
+      @short_description: The ModemManager 3GPP interface.
+
+      This interface provides access to specific actions that may be performed
+      in modems with 3GPP capabilities.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp">
+
+    <!--
+        Register:
+        @operator_id: The operator ID (ie, <literal>"MCCMNC"</literal>, like <literal>"310260"</literal>) to register. An empty string can be used to register to the home network.
+
+        Request registration with a given mobile network.
+    -->
+    <method name="Register">
+      <arg name="operator_id" type="s" direction="in" />
+    </method>
+
+    <!--
+        Scan:
+        @results: Array of dictionaries wih the found networks.
+
+        Scan for available networks.
+
+        @results is an array of dictionaries with each array element describing
+        a mobile network found in the scan. Each dictionary may include one or
+        more of the following keys:
+        <variablelist>
+          <varlistentry><term><literal>"status"</literal></term>
+            <listitem>
+              A <link linkend="MMModem3gppNetworkAvailability">MMModem3gppNetworkAvailability</link>
+              value representing network availability status, given as an
+              unsigned integer (signature <literal>"u"</literal>). This key will
+              always be present.
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"operator-long"</literal></term>
+            <listitem>
+              Long-format name of operator, given as a string value (signature
+              <literal>"s"</literal>). If the name is unknown, this field
+              should not be present.
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"operator-short"</literal></term>
+            <listitem>
+              Short-format name of operator, given as a string value (signature
+              <literal>"s"</literal>). If the name is unknown, this field
+              should not be present.
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"operator-code"</literal></term>
+            <listitem>
+              Mobile code of the operator, given as a string value (signature
+              <literal>"s"</literal>). Returned in the format
+              <literal>"MCCMNC"</literal>, where <literal>MCC</literal> is the
+              three-digit ITU E.212 Mobile Country Code and <literal>MNC</literal>
+              is the two- or three-digit GSM Mobile Network Code. e.g.
+              <literal>"31026"</literal> or <literal>"310260"</literal>.
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"access-technology"</literal></term>
+            <listitem>
+              A <link linkend="MMModemAccessTechnology">MMModemAccessTechnology</link> value
+              representing the generic access technology used by this mobile network,
+              given as an unsigned integer (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <method name="Scan">
+      <arg name="results" type="aa{sv}" direction="out" />
+    </method>
+
+    <!--
+        Imei:
+
+        The <ulink url="http://en.wikipedia.org/wiki/Imei">IMEI</ulink> of the device.
+    -->
+    <property name="Imei" type="s" access="read" />
+
+    <!--
+        RegistrationState:
+
+        A <link linkend="MMModem3gppRegistrationState">MMModem3gppRegistrationState</link>
+        value specifying the mobile registration status as defined in 3GPP TS 27.007
+        section 10.1.19.
+    -->
+    <property name="RegistrationState" type="u" access="read" />
+
+    <!--
+        OperatorCode:
+
+        Code of the operator to which the mobile is currently registered.
+
+        Returned in the format <literal>"MCCMNC"</literal>, where
+        <literal>MCC</literal> is the three-digit ITU E.212 Mobile Country Code
+        and <literal>MNC</literal> is the two- or three-digit GSM Mobile Network
+        Code. e.g. e<literal>"31026"</literal> or <literal>"310260"</literal>.
+
+        If the <literal>MCC</literal> and <literal>MNC</literal> are not known
+        or the mobile is not registered to a mobile network, this property will
+        be a zero-length (blank) string.
+    -->
+    <property name="OperatorCode" type="s" access="read" />
+
+    <!--
+        OperatorName:
+
+        Name of the operator to which the mobile is currently registered.
+
+        If the operator name is not known or the mobile is not
+        registered to a mobile network, this property will be a zero-length
+        (blank) string.
+    -->
+    <property name="OperatorName" type="s" access="read" />
+
+    <!--
+        EnabledFacilityLocks:
+
+        Bitmask of <link linkend="MMModem3gppFacility">MMModem3gppFacility</link> values
+        for which PIN locking is enabled.
+    -->
+    <property name="EnabledFacilityLocks" type="u" access="read" />
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml b/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
new file mode 100644
index 0000000..11808b7
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem.ModemCdma:
+      @short_description: The ModemManager CDMA interface.
+
+      This interface provides access to specific actions that may be performed
+      in modems with CDMA capabilities.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem.ModemCdma">
+
+    <!--
+        Activate:
+        @carrier_code: Name of carrier, or carrier-specific code.
+
+        Provisions the modem for use with a given carrier using the modem's
+        <ulink url="http://en.wikipedia.org/wiki/Over-the-air_programming">Over-The-Air (OTA)</ulink>
+        activation functionality, if any.
+
+        Some modems will reboot after this call is made.
+    -->
+    <method name="Activate">
+      <arg name="carrier_code" type="s" direction="in" />
+    </method>
+
+    <!--
+        ActivateManual:
+        @properties: A dictionary of properties to set on the modem, including <literal>"mdn"</literal> and <literal>"min"</literal>.
+
+        Sets the modem provisioning data directly, without contacting the
+        carrier over the air.
+
+        Some modems will reboot after this call is made.
+    -->
+    <method name="ActivateManual">
+      <arg name="properties" type="a{sv}" direction="in" />
+    </method>
+
+    <!--
+        ActivationStateChanged:
+        @activation_state: Current activation state, given as a <link linkend="MMModemCdmaActivationState">MMModemCdmaActivationState</link>.
+        @activation_error: Carrier-specific error code, given as a <link linkend="MMCdmaActivationError">MMCdmaActivationError</link>.
+        @status_changes: Properties that have changed as a result of this activation state chage, including <literal>"mdn"</literal> and <literal>"min"</literal>. The dictionary may be empty if the changed properties are unknown.
+
+        The device activation state changed.
+    -->
+    <signal name="ActivationStateChanged">
+      <arg name="activation_state" type="u"     />
+      <arg name="activation_error" type="u"     />
+      <arg name="status_changes"   type="a{sv}" />
+    </signal>
+
+    <!--
+        ActivationState:
+
+        A <link linkend="MMModemCdmaActivationState">MMModemCdmaActivationState</link>
+        value specifying the state of the activation in the 3GPP2 network.
+    -->
+    <property name="ActivationState" type="u" access="read" />
+
+    <!--
+        Meid:
+
+        The modem's <ulink url="http://en.wikipedia.org/wiki/MEID">Mobile Equipment Identifier</ulink>.
+    -->
+    <property name="Meid" type="s" access="read" />
+
+
+    <!--
+        Esn:
+
+        The modem's
+        <ulink url="http://en.wikipedia.org/wiki/Electronic_serial_number">Electronic Serial Number</ulink>
+        (superceded by MEID but still used by older devices).
+    -->
+    <property name="Esn" type="s" access="read" />
+
+    <!--
+        Sid:
+
+        The
+        <ulink url="http://en.wikipedia.org/wiki/System_Identification_Number">System Identifier</ulink>
+        of the serving CDMA 1x network, if known, and
+        if the modem is registered with a CDMA 1x network.
+
+        See <ulink url="http://ifast.org">ifast.org</ulink> or the mobile
+        broadband provider database for mappings of SIDs to network providers.
+    -->
+    <property name="Sid" type="u" access="read" />
+
+    <!--
+        Nid:
+
+        The
+        <ulink url="http://en.wikipedia.org/wiki/Network_Identification_Number">Network Identifier</ulink>
+        of the serving CDMA 1x network, if known, and
+        if the modem is registered with a CDMA 1x network.
+    -->
+    <property name="Nid" type="u" access="read" />
+
+    <!--
+        Cdma1xRegistrationState:
+
+        A <link linkend="MMModemCdmaRegistrationState">MMModemCdmaRegistrationState</link>
+        value specifying the CDMA 1x registration state.
+    -->
+    <property name="Cdma1xRegistrationState" type="u" access="read" />
+
+    <!--
+        EvdoRegistrationState:
+
+        A <link linkend="MMModemCdmaRegistrationState">MMModemCdmaRegistrationState</link>
+        value specifying the EVDO registration state.
+    -->
+    <property name="EvdoRegistrationState" type="u" access="read" />
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Simple.xml b/introspection/org.freedesktop.ModemManager1.Modem.Simple.xml
new file mode 100644
index 0000000..1e7d6ac
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.Simple.xml
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem.Simple:
+      @short_description: The ModemManager Simple interface.
+
+      The Simple interface allows controlling and querying the status of Modems.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem.Simple">
+
+    <!--
+        Connect:
+        @properties: Dictionary of properties needed to get the modem connected.
+        @bearer: On successful connect, returns the object path of the connected packet data bearer used for the connection attempt.
+
+        Do everything needed to connect the modem using the given properties.
+
+        This method will attempt to find a matching packet data bearer and
+        activate it if necessary, returning the bearer's IP details.  If no
+        matching bearer is found, a new bearer will be created and activated,
+        but this operation may fail if no resources are available to complete
+        this connection attempt (ie, if a conflicting bearer is already active).
+
+        This call may make a large number of changes to modem configuration
+        based on properties passed in. For example, given a PIN-locked, disabled
+        GSM/UMTS modem, this call may unlock the SIM PIN, alter the access
+        technology preference, wait for network registration (or force
+        registration to a specific provider), create a new packet data bearer
+        using the given "apn", and connect that bearer.
+
+        Allowed key/value pairs in @properties are:
+        <variablelist>
+          <varlistentry><term><literal>"pin"</literal></term>
+            <listitem>
+              SIM-PIN unlock code, given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"operator-id"</literal></term>
+            <listitem>
+              ETSI MCC-MNC of a network to force registration with,
+              given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"apn"</literal></term>
+            <listitem>
+              For GSM/UMTS and LTE devices the APN to use,
+              given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"ip-type"</literal></term>
+            <listitem>
+              For GSM/UMTS and LTE devices the IP addressing type to use,
+              given as a <link linkend="MMBearerIpFamily">MMBearerIpFamily</link>
+              value (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"allowed-auth"</literal></term>
+            <listitem>
+              The authentication method to use, given as a
+              <link linkend="MMBearerAllowedAuth">MMBearerAllowedAuth</link>
+              value (signature <literal>"u"</literal>). Optional in 3GPP.
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"user"</literal></term>
+            <listitem>
+              User name (if any) required by the network, given as a string
+              value (signature <literal>"s"</literal>). Optional in 3GPP.
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"password"</literal></term>
+            <listitem>
+              Password (if any) required by the network, given as a string value
+              (signature <literal>"s"</literal>). Optional in 3GPP.
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"number"</literal></term>
+            <listitem>
+              For POTS devices the number to dial,,
+              given as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"allow-roaming"</literal></term>
+            <listitem>
+              %FALSE to allow only connections to home networks,
+              given as a boolean value (signature <literal>"b"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"rm-protocol"</literal></term>
+            <listitem>
+              For CDMA devices, the protocol of the Rm interface, given as a
+              <link linkend="MMModemCdmaRmProtocol">MMModemCdmaRmProtocol</link>
+              value (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <method name="Connect">
+      <arg name="properties" type="a{sv}" direction="in"  />
+      <arg name="bearer"     type="o"     direction="out" />
+    </method>
+
+    <!--
+        Disconnect:
+        @bearer: If given this method will disconnect the referenced packet
+        data bearer, while if "/" (ie, no object given) this method will
+        disconnect all active packet data bearers.
+
+        Disconnect an active packet data connection.
+    -->
+    <method name="Disconnect">
+      <arg name="bearer" type="o" direction="in" />
+    </method>
+
+    <!--
+        GetStatus:
+        @properties: Dictionary of properties.
+
+        Get the general modem status.
+
+        The predefined common properties returned are:
+        <variablelist>
+          <varlistentry><term><literal>"state"</literal></term>
+            <listitem>
+              A <link linkend="MMModemState">MMModemState</link> value
+              specifying the overall state of the modem, given as an
+              unsigned integer value (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"signal-quality"</literal></term>
+            <listitem>
+              Signal quality value, given only when registered,
+              as an unsigned integer value
+              (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"current-bands"</literal></term>
+            <listitem>
+              List of <link linkend="MMModemBand">MMModemBand</link> values,
+              given only when registered, as a list of
+              unsigned integer values (signature <literal>"au"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"access-technology"</literal></term>
+            <listitem>
+              A <link linkend="MMModemAccessTechnology">MMModemAccessTechnology</link> value,
+              given only when registered, as an unsigned integer value
+              (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"m3gpp-registration-state"</literal></term>
+            <listitem>
+              A <link linkend="MMModem3gppRegistrationState">MMModem3gppRegistrationState</link> value
+              specifying the state of the registration, given only when registered
+              in a 3GPP network, as an unsigned integer value (signature
+              <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"m3gpp-operator-code"</literal></term>
+            <listitem>
+              Operator <literal>MCC-MNC</literal>, given only when registered
+              in a 3GPP network, as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"m3gpp-operator-name"</literal></term>
+            <listitem>
+              Operator name, given only when registered in a 3GPP network,
+              as a string value (signature <literal>"s"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"cdma-cdma1x-registration-state"</literal></term>
+            <listitem>
+              A <link linkend="MMModemCdmaRegistrationState">MMModemCdmaRegistrationState</link> value
+              specifying the state of the registration, given only when registered
+              in a CDMA1x network, as an unsigned integer value (signature
+              <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"cdma-evdo-registration-state"</literal></term>
+            <listitem>
+              A <link linkend="MMModemCdmaRegistrationState">MMModemCdmaRegistrationState</link> value
+              specifying the state of the registration, given only when registered
+              in a EV-DO network, as an unsigned integer value (signature
+              <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"cdma-sid"</literal></term>
+            <listitem>
+              The System Identifier of the serving network, if registered in a CDMA1x network and if known.
+              Given as an unsigned integer value (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"cdma-nid"</literal></term>
+            <listitem>
+              The Network Identifier of the serving network, if registered in a CDMA1x network and if known.
+              Given as an unsigned integer value (signature <literal>"u"</literal>).
+            </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <method name="GetStatus">
+      <arg name="properties" type="a{sv}" direction="out" />
+    </method>
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Time.xml b/introspection/org.freedesktop.ModemManager1.Modem.Time.xml
new file mode 100644
index 0000000..0558f02
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.Time.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 - 2012 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem.Time:
+      @short_description: The ModemManager Time interface.
+
+      This interface allows clients to receive network time and timezone
+      updates broadcast by mobile networks.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem.Time">
+
+    <!--
+        GetNetworkTime:
+        @time: If the network time is known, a string containing local date,
+        time, and (if available) UTC offset in ISO 8601 format. If the network
+        time is unknown, the empty string.
+
+        Gets the current network time in local time.
+
+        This method will only work if the modem tracks, or can request, the
+        current network time; it will not attempt to use previously-received
+        network time updates on the host to guess the current network time.
+    -->
+    <method name="GetNetworkTime">
+      <arg name="time" type="s" direction="out" />
+    </method>
+
+    <!--
+        NetworkTimezone:
+
+        The timezone data provided by the network. It may include one or more
+        of the following fields:
+
+        <variablelist>
+          <varlistentry><term><literal>"offset"</literal></term>
+            <listitem>
+              Offset of the timezone from UTC, in minutes (including DST, if applicable),
+              given as a signed integer value (signature <literal>"i"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"dst-offset"</literal></term>
+            <listitem>
+              Amount of offset that is due to DST (daylight saving time),
+              given as a signed integer value (signature <literal>"i"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"leap-seconds"</literal></term>
+            <listitem>
+              Number of leap seconds included in the network time,
+              given as a signed integer value (signature <literal>"i"</literal>).
+            </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <property name="NetworkTimezone" type="a{sv}" access="read" />
+
+    <!--
+        NetworkTimeChanged:
+        @time: A string containing date and time in ISO 8601 format.
+
+        Sent when the network time is updated.
+    -->
+    <signal name="NetworkTimeChanged">
+      <arg name="time" type="s" />
+    </signal>
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.xml b/introspection/org.freedesktop.ModemManager1.Modem.xml
new file mode 100644
index 0000000..3f9af1a
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.xml
@@ -0,0 +1,490 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem:
+      @short_description: The ModemManager Modem interface.
+
+      The Modem interface controls the status and actions in a given modem
+      object.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem">
+
+    <!--
+        Enable:
+        @enable: %TRUE to enable the modem and %FALSE to disable it.
+
+        Enable or disable the modem.
+
+        When enabled, the modem's radio is powered on and data sessions, voice
+        calls, location services, and Short Message Service may be available.
+
+        When disabled, the modem enters low-power state and no network-related
+        operations are available.
+    -->
+    <method name="Enable">
+      <arg name="enable" type="b" direction="in" />
+    </method>
+
+    <!--
+        ListBearers:
+        @bearers: The list of bearer object paths.
+
+        List configured packet data bearers (EPS Bearers, PDP Contexts, or
+        CDMA2000 Packet Data Sessions).
+    -->
+    <method name="ListBearers">
+      <arg name="bearers" type="ao" direction="out" />
+    </method>
+
+    <!--
+        CreateBearer:
+        @properties: List of properties to assign to the bearer after creating it.
+        @path: On success, the object path of the newly created bearer.
+
+        Create a new packet data bearer using the given characteristics.
+
+        This request may fail if the modem does not support additional bearers,
+        if too many bearers are already defined, or if properties are invalid.
+
+        Allowed properties are:
+        <variablelist>
+        <varlistentry><term><literal>"apn"</literal></term>
+          <listitem><para>Access Point Name, given as a string value (signature <literal>"s"</literal>). Required in 3GPP.</para></listitem></varlistentry>
+        <varlistentry><term><literal>"ip-type"</literal></term>
+          <listitem><para>Addressing type, given as a <link linkend="MMBearerIpFamily">MMBearerIpFamily</link> value (signature <literal>"u"</literal>). Optional in 3GPP and CDMA.</para></listitem></varlistentry>
+        <varlistentry><term><literal>"allowed-auth"</literal></term>
+          <listitem><para>The authentication method to use, given as a <link linkend="MMBearerAllowedAuth">MMBearerAllowedAuth</link> value (signature <literal>"u"</literal>). Optional in 3GPP.</para></listitem></varlistentry>
+        <varlistentry><term><literal>"user"</literal></term>
+          <listitem><para>User name (if any) required by the network, given as a string value (signature <literal>"s"</literal>). Optional in 3GPP.</para></listitem></varlistentry>
+        <varlistentry><term><literal>"password"</literal></term>
+          <listitem><para>Password (if any) required by the network, given as a string value (signature <literal>"s"</literal>). Optional in 3GPP.</para></listitem></varlistentry>
+        <varlistentry><term><literal>"allow-roaming"</literal></term>
+          <listitem><para>Flag to tell whether connection is allowed during roaming, given as a boolean value (signature <literal>"b"</literal>). Optional in 3GPP.</para></listitem></varlistentry>
+        <varlistentry><term><literal>"rm-protocol"</literal></term>
+          <listitem><para>Protocol of the Rm interface, given as a <link linkend="MMModemCdmaRmProtocol">MMModemCdmaRmProtocol</link> value (signature <literal>"u"</literal>). Optional in CDMA.</para></listitem></varlistentry>
+        <varlistentry><term><literal>"number"</literal></term>
+          <listitem><para>Telephone number to dial, given as a string value (signature <literal>"s"</literal>). Required in POTS.</para></listitem></varlistentry>
+        </variablelist>
+
+        Some properties are only applicable to a bearer of certain access
+        technologies, for example the <literal>"apn"</literal> property is not
+        applicable to CDMA2000 Packet Data Session bearers.
+    -->
+    <method name="CreateBearer">
+      <arg name="properties" type="a{sv}" direction="in"  />
+      <arg name="path"       type="o"     direction="out" />
+    </method>
+
+    <!--
+        DeleteBearer:
+        @bearer: Object path of the bearer to delete.
+
+        Delete an existing packet data bearer.
+
+        If the bearer is currently active and providing packet data server, it
+        will be disconnected and that packet data service will terminate.
+    -->
+    <method name="DeleteBearer">
+      <arg name="bearer" type="o" direction="in" />
+    </method>
+
+    <!--
+        Reset:
+
+        Clear non-persistent configuration and state, and return the device to
+        a newly-powered-on state.
+
+        This command may power-cycle the device.
+    -->
+    <method name="Reset" />
+
+    <!--
+        FactoryReset:
+        @code: Carrier-supplied code required to reset the modem.
+
+        Clear the modem's configuration (including persistent configuration and
+        state), and return the device to a factory-default state.
+
+        If not required by the modem, @code may be ignored.
+
+        This command may or may not power-cycle the device.
+    -->
+    <method name="FactoryReset">
+      <arg name="code" type="s" direction="in" />
+    </method>
+
+    <!--
+        SetPowerState:
+	@state: A <link linkend="MMModemPowerState">MMModemPowerState</link> value, to specify the desired power state.
+
+        Set the power state of the modem. This action can only be run when the
+	modem is in <link linkend="MM-MODEM-STATE-DISABLED:CAPS"><constant>MM_MODEM_STATE_DISABLED</constant></link>
+	state.
+    -->
+    <method name="SetPowerState">
+      <arg name="state" type="u" direction="in" />
+    </method>
+
+    <!--
+        SetCurrentCapabilities:
+        @capabilities: Bitmask of <link linkend="MMModemCapability">MMModemCapability</link> values, to specify the capabilities to use.
+
+        Set the capabilities of the device. A restart of the modem may be required.
+    -->
+    <method name="SetCurrentCapabilities">
+      <arg name="capabilities" type="u" direction="in" />
+    </method>
+
+    <!--
+        SetCurrentModes:
+        @modes: A pair of <link linkend="MMModemMode">MMModemMode</link> values, where the first one is a bitmask of allowed modes, and the second one the preferred mode, if any.
+
+        Set the access technologies (e.g. 2G/3G/4G preference) the device is
+        currently allowed to use when connecting to a network.
+
+        The given combination should be supported by the modem, as specified in the
+        #org.freedesktop.ModemManager1.Modem:SupportedModes property.
+    -->
+    <method name="SetCurrentModes">
+      <arg name="modes" type="(uu)" direction="in" />
+    </method>
+
+    <!--
+        SetCurrentBands:
+        @bands: List of <link linkend="MMModemBand">MMModemBand</link> values, to specify the bands to be used.
+
+        Set the radio frequency and technology bands the device is currently
+        allowed to use when connecting to a network.
+    -->
+    <method name="SetCurrentBands">
+      <arg name="bands" type="au" direction="in" />
+    </method>
+
+    <!--
+       Command
+       @cmd The command string, e.g. "AT+GCAP" or "+GCAP" (leading AT is inserted if necessary).
+       @timeout The number of seconds to wait for a response.
+       @response The modem's response.
+
+       Send an arbitrary AT command to a modem and get the response.
+
+       Note that using this interface call is only allowed when running
+       ModemManager in debug mode.
+      -->
+    <method name="Command">
+      <arg name="cmd"      type="s" direction="in"  />
+      <arg name="timeout"  type="u" direction="in"  />
+      <arg name="response" type="s" direction="out" />
+    </method>
+
+    <!--
+        StateChanged:
+        @old: A <link linkend="MMModemState">MMModemState</link> value, specifying the new state.
+        @new: A <link linkend="MMModemState">MMModemState</link> value, specifying the new state.
+        @reason: A <link linkend="MMModemStateChangeReason">MMModemStateChangeReason</link> value, specifying the reason for this state change.
+
+        The modem's state (see #org.freedesktop.ModemManager1.Modem:State) changed.
+    -->
+    <signal name="StateChanged">
+      <arg name="old"    type="i" />
+      <arg name="new"    type="i" />
+      <arg name="reason" type="u" />
+    </signal>
+
+    <!--
+        Sim:
+
+        The path of the SIM object available in this device, if any.
+    -->
+    <property name="Sim" type="o" access="read" />
+
+    <!--
+        SupportedCapabilities:
+
+        List of <link linkend="MMModemCapability">MMModemCapability</link>
+        values, specifying the combinations of generic family of access
+        technologies the modem supports.
+
+        If the modem doesn't allow changing the current capabilities, a single entry with
+        <link linkend="MM-MODEM-CAPABILITY-ANY:CAPS"><constant>MM_MODEM_CAPABILITY_ANY</constant></link>
+        will be given.
+    -->
+    <property name="SupportedCapabilities" type="au" access="read" />
+
+    <!--
+        CurrentCapabilities:
+
+        Bitmask of <link linkend="MMModemCapability">MMModemCapability</link>
+        values, specifying the  generic family of access technologies the modem
+        currently supports without a firmware reload or reinitialization.
+    -->
+    <property name="CurrentCapabilities" type="u" access="read" />
+
+    <!--
+        MaxBearers:
+
+        The maximum number of defined packet data bearers the modem supports.
+
+        This is not the number of active/connected bearers the modem supports,
+        but simply the number of bearers that may be defined at any given time.
+        For example, POTS and CDMA2000-only devices support only one bearer,
+        while GSM/UMTS devices typically support three or more, and any
+        LTE-capable device (whether LTE-only, GSM/UMTS-capable, and/or
+        CDMA2000-capable) also typically support three or more.
+    -->
+    <property name="MaxBearers" type="u" access="read" />
+
+    <!--
+        MaxActiveBearers:
+
+        The maximum number of active packet data bearers the modem supports.
+
+        POTS and CDMA2000-only devices support one active bearer, while GSM/UMTS
+        and LTE-capable devices (including LTE/CDMA devices) typically support
+        at least two active bearers.
+    -->
+    <property name="MaxActiveBearers" type="u" access="read" />
+
+    <!--
+        Manufacturer:
+
+        The equipment manufacturer, as reported by the modem.
+    -->
+    <property name="Manufacturer" type="s" access="read" />
+
+    <!--
+        Model:
+
+        The equipment model, as reported by the modem.
+    -->
+    <property name="Model" type="s" access="read" />
+
+    <!--
+        Revision:
+
+        The revision identification of the software, as reported by the modem.
+    -->
+    <property name="Revision" type="s" access="read" />
+
+    <!--
+        DeviceIdentifier:
+
+        A best-effort device identifier based on various device information like
+        model name, firmware revision, USB/PCI/PCMCIA IDs, and other properties.
+
+        This ID is not guaranteed to be unique and may be shared between
+        identical devices with the same firmware, but is intended to be "unique
+        enough" for use as a casual device identifier for various user
+        experience operations.
+
+        This is not the device's IMEI or ESN since those may not be available
+        before unlocking the device via a PIN.
+    -->
+    <property name="DeviceIdentifier" type="s" access="read" />
+
+    <!--
+        Device:
+
+        The physical modem device reference (ie, USB, PCI, PCMCIA device), which
+        may be dependent upon the operating system.
+
+        In Linux for example, this points to a sysfs path of the usb_device
+        object.
+    -->
+    <property name="Device" type="s" access="read" />
+
+    <!--
+        Drivers:
+
+        The Operating System device drivers handling communication with the modem
+        hardware.
+    -->
+    <property name="Drivers" type="as" access="read" />
+
+    <!--
+        Plugin:
+
+        The name of the plugin handling this modem.
+    -->
+    <property name="Plugin" type="s" access="read" />
+
+    <!--
+        PrimaryPort:
+
+        The name of the primary port using to control the modem.
+    -->
+    <property name="PrimaryPort" type="s" access="read" />
+
+    <!--
+        EquipmentIdentifier:
+
+        The identity of the device.
+
+        This will be the IMEI number for GSM devices and the hex-format ESN/MEID
+        for CDMA devices.
+    -->
+    <property name="EquipmentIdentifier" type="s" access="read" />
+
+    <!--
+        UnlockRequired:
+
+        Current lock state of the device, given as a
+        <link linkend="MMModemLock">MMModemLock</link> value.
+    -->
+    <property name="UnlockRequired" type="u" access="read" />
+
+    <!--
+        UnlockRetries:
+
+        A dictionary in which the keys are <link linkend="MMModemLock">MMModemLock</link>
+        flags, and the values are integers giving the number of PIN tries remaining
+        before the code becomes blocked (requiring a PUK) or permanently blocked. Dictionary
+        entries exist only for the codes for which the modem is able to report retry
+        counts.
+     -->
+    <property name="UnlockRetries" type="a{uu}" access="read" />
+
+    <!--
+        State:
+
+        Overall state of the modem, given as a
+        <link linkend="MMModemState">MMModemState</link> value.
+
+        If the device's state cannot be determined,
+        <link linkend="MM-MODEM-STATE-UNKNOWN:CAPS"><constant>MM_MODEM_STATE_UNKNOWN</constant></link>
+        will be reported.
+    -->
+    <property name="State" type="i" access="read" />
+
+    <!--
+        StateFailedReason:
+
+        Error specifying why the modem is in
+	<link linkend="MM-MODEM-STATE-FAILED:CAPS"><constant>MM_MODEM_STATE_FAILED</constant></link>
+	state, given as a
+	<link linkend="MMModemStateFailedReason">MMModemStateFailedReason</link> value.
+    -->
+    <property name="StateFailedReason" type="u" access="read" />
+
+    <!--
+        AccessTechnologies:
+
+        Bitmask of <link linkend="MMModemAccessTechnology">MMModemAccessTechnology</link> values,
+        specifying the current network access technologies used by the device to communicate
+        with the network.
+
+        If the device's access technology cannot be determined,
+        <link linkend="MM-MODEM-ACCESS-TECHNOLOGY-UNKNOWN:CAPS"><constant>MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN</constant></link>
+        will be reported.
+    -->
+    <property name="AccessTechnologies" type="u" access="read" />
+
+    <!--
+        SignalQuality:
+
+        Signal quality in percent (0 - 100) of the dominant access technology
+        the device is using to communicate with the network. Always 0 for POTS
+        devices.
+
+        The additional boolean value indicates if the quality value given was
+        recently taken.
+    -->
+    <property name="SignalQuality" type="(ub)" access="read" />
+
+    <!--
+        OwnNumbers:
+
+        List of numbers (e.g. MSISDN in 3GPP) being currently handled by this
+        modem.
+    -->
+    <property name="OwnNumbers" type="as" access="read" />
+
+    <!--
+        PowerState:
+
+	A <link linkend="MMModemPowerState">MMModemPowerState</link> value
+	specifying the current power state of the modem.
+    -->
+    <property name="PowerState" type="u" access="read" />
+
+    <!--
+        SupportedModes:
+
+        This property exposes the supported mode combinations, given as an array of unsigned
+        integer pairs, where:
+
+        <variablelist>
+          <varlistentry>
+            <listitem>
+              The first integer is a bitmask of <link linkend="MMModemMode">MMModemMode</link> values,
+              specifying the allowed modes.
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <listitem>
+              The second integer is a single <link linkend="MMModemMode">MMModemMode</link>, which
+              specifies the preferred access technology, among the ones defined in the allowed modes.
+            </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <property name="SupportedModes" type="a(uu)" access="read" />
+
+    <!--
+        CurrentModes:
+
+        A pair of <link linkend="MMModemMode">MMModemMode</link> values, where the first one
+        is a bitmask specifying the access technologies (eg 2G/3G/4G) the device
+        is currently allowed to use when connecting to a network, and the second one is the
+        preferred mode of those specified as allowed.
+
+        The pair must be one of those specified in
+        #org.freedesktop.ModemManager1.Modem:SupportedModes.
+    -->
+    <property name="CurrentModes" type="(uu)" access="read" />
+
+    <!--
+        SupportedBands:
+
+        List of <link linkend="MMModemBand">MMModemBand</link> values,
+        specifying the radio frequency and technology bands supported by the
+        device.
+
+        For POTS devices, only the
+        <link linkend="MM-MODEM-BAND-ANY:CAPS"><constant>MM_MODEM_BAND_ANY</constant></link>
+        mode will be returned.
+    -->
+    <property name="SupportedBands" type="au" access="read" />
+
+    <!--
+        CurrentBands:
+
+        List of <link linkend="MMModemBand">MMModemBand</link> values,
+        specifying the radio frequency and technology bands the device is
+        currently using when connecting to a network.
+
+        It must be a subset of #org.freedesktop.ModemManager1.Modem:SupportedBands.
+    -->
+    <property name="CurrentBands" type="au" access="read" />
+
+    <!--
+        SupportedIpFamilies:
+
+        Bitmask of <link linkend="MMBearerIpFamily">MMBearerIpFamily</link> values,
+        specifying the IP families supported by the device.
+    -->
+    <property name="SupportedIpFamilies" type="u" access="read" />
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Sim.xml b/introspection/org.freedesktop.ModemManager1.Sim.xml
new file mode 100644
index 0000000..14f9077
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Sim.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Sim:
+      @short_description: The ModemManager SIM interface.
+
+      The SIM interface handles communication with SIM, USIM, and RUIM (CDMA
+      SIM) cards.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Sim">
+
+    <!--
+        SendPin:
+        @pin: A string containing the PIN code.
+
+        Send the PIN to unlock the SIM card.
+    -->
+    <method name="SendPin">
+      <arg name="pin" type="s" direction="in" />
+    </method>
+
+    <!--
+        SendPuk:
+        @puk: A string containing the PUK code.
+        @pin: A string containing the PIN code.
+
+        Send the PUK and a new PIN to unlock the SIM card.
+    -->
+    <method name="SendPuk">
+      <arg name="puk" type="s" direction="in" />
+      <arg name="pin" type="s" direction="in" />
+    </method>
+
+    <!--
+        EnablePin:
+        @pin: A string containing the PIN code.
+        @enabled: %TRUE to enable PIN checking, %FALSE otherwise.
+
+        Enable or disable the PIN checking.
+    -->
+    <method name="EnablePin">
+      <arg name="pin"     type="s" direction="in" />
+      <arg name="enabled" type="b" direction="in" />
+    </method>
+
+    <!--
+        ChangePin:
+        @old_pin: A string containing the current PIN code.
+        @new_pin: A string containing the new PIN code.
+
+        Change the PIN code.
+    -->
+    <method name="ChangePin">
+      <arg name="old_pin" type="s" direction="in" />
+      <arg name="new_pin" type="s" direction="in" />
+    </method>
+
+    <!--
+        SimIdentifier:
+
+        An obfuscated SIM identifier based on the IMSI or the
+        ICCID.
+
+        This may be available before the PIN has been entered depending
+        on the device itself.
+    -->
+    <property name="SimIdentifier" type="s" access="read" />
+
+    <!--
+        Imsi:
+
+        The IMSI of the SIM card, if any.
+    -->
+    <property name="Imsi" type="s" access="read" />
+
+    <!--
+        OperatorId:
+
+        The ID of the network operator that issued the SIM card,
+        formatted as a 5 or 6-digit MCC/MNC code (e.g. <literal>"310410"</literal>).
+    -->
+    <property name="OperatorIdentifier" type="s" access="read" />
+
+    <!--
+        OperatorName:
+
+        The name of the network operator, as given by the SIM card, if known.
+    -->
+    <property name="OperatorName" type="s" access="read" />
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Sms.xml b/introspection/org.freedesktop.ModemManager1.Sms.xml
new file mode 100644
index 0000000..586c2fd
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Sms.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Sms:
+      @short_description: The ModemManager SMS interface.
+
+      The SMS interface Defines operations and properties of a single SMS message.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Sms">
+
+    <!--
+        Send:
+
+        If the message has not yet been sent, queue it for delivery.
+    -->
+    <method name="Send" />
+
+    <!--
+        Store:
+
+        Store the message in the device if not already done.
+
+        This method requires a <link linkend="MMSmsStorage">MMSmsStorage</link>
+        value, describing the storage where this message is to be kept; or
+        <link linkend="MM-SMS-STORAGE-UNKNOWN:CAPS"><constant>MM_SMS_STORAGE_UNKNOWN</constant></link>
+        if the default storage should be used.
+    -->
+    <method name="Store">
+      <arg name="storage" type="u" direction="in" />
+    </method>
+
+    <!--
+        State:
+
+        A <link linkend="MMSmsState">MMSmsState</link> value,
+        describing the state of the message.
+    -->
+    <property name="State" type="u" access="read" />
+
+    <!--
+        PduType:
+
+        A <link linkend="MMSmsPduType">MMSmsPduType</link> value,
+        describing the type of PDUs used in the SMS message.
+    -->
+    <property name="PduType" type="u" access="read" />
+
+    <!--
+        Number:
+
+        Number to which the message is addressed.
+    -->
+    <property name="Number" type="s" access="read" />
+
+    <!--
+        Text:
+
+        Message text, in UTF-8.
+
+        When sending, if the text is larger than the limit of the technology or
+        modem, the message will be broken into multiple parts or messages.
+
+        Note that Text and Data are never given at the same time.
+    -->
+    <property name="Text" type="s" access="read" />
+
+    <!--
+        Data:
+
+        Message data.
+
+        When sending, if the data is larger than the limit of the technology or
+        modem, the message will be broken into multiple parts or messages.
+
+        Note that Text and Data are never given at the same time.
+    -->
+    <property name="Data" type="ay" access="read" />
+
+    <!--
+        SMSC:
+
+        Indicates the SMS service center number.
+
+        Always empty for 3GPP2/CDMA.
+    -->
+    <property name="SMSC" type="s" access="read" />
+
+    <!--
+        Validity:
+
+        Indicates when the SMS expires in the SMSC.
+
+        This value is composed of a
+	<link linkend="MMSmsValidityType">MMSmsValidityType</link>
+	key, with an associated data which contains type-specific validity
+	information:
+
+	<variablelist>
+	  <varlistentry><term><link linkend="MM-SMS-VALIDITY-TYPE-RELATIVE:CAPS">MM_SMS_VALIDITY_TYPE_RELATIVE</link></term>
+          <listitem>
+            <para>
+	      The value is the length of the validity period in minutes, given
+	      as an unsigned integer (D-Bus signature <literal>'u'</literal>).
+            </para>
+          </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <property name="Validity" type="(uv)" access="read" />
+
+    <!--
+        Class:
+
+        3GPP message class (-1..3).  -1 means class is not available or
+        is not used for this message, otherwise the 3GPP SMS message class.
+
+        Always -1 for 3GPP2/CDMA.
+    -->
+    <property name="Class" type="i" access="read" />
+
+    <!--
+        DeliveryReportRequest:
+
+        #TRUE if delivery report request is required, #FALSE otherwise.
+    -->
+    <property name="DeliveryReportRequest" type="b" access="read" />
+
+    <!--
+        MessageReference:
+
+        Message Reference of the last PDU sent/received within this SMS.
+
+        If the PDU type is
+        <link linkend="MM-SMS-PDU-TYPE-STATUS-REPORT:CAPS"><constant>MM_SMS_PDU_TYPE_STATUS_REPORT</constant></link>,
+        this field identifies the Message Reference of the PDU associated to the status report.
+    -->
+    <property name="MessageReference" type="u" access="read" />
+
+    <!--
+        Timestamp:
+
+        Time when the first PDU of the SMS message arrived the SMSC, in
+        <ulink url="http://en.wikipedia.org/wiki/ISO_8601">ISO8601</ulink>
+        format.
+        This field is only applicable if the PDU type is
+        <link linkend="MM-SMS-PDU-TYPE-DELIVER:CAPS"><constant>MM_SMS_PDU_TYPE_DELIVER</constant></link>.
+        or
+        <link linkend="MM-SMS-PDU-TYPE-STATUS-REPORT:CAPS"><constant>MM_SMS_PDU_TYPE_STATUS_REPORT</constant></link>.
+    -->
+    <property name="Timestamp" type="s" access="read" />
+
+    <!--
+        DischargeTimestamp:
+
+        Time when the first PDU of the SMS message left the SMSC, in
+        <ulink url="http://en.wikipedia.org/wiki/ISO_8601">ISO8601</ulink>
+        format.
+
+        This field is only applicable if the PDU type is
+        <link linkend="MM-SMS-PDU-TYPE-STATUS-REPORT:CAPS"><constant>MM_SMS_PDU_TYPE_STATUS_REPORT</constant></link>.
+    -->
+    <property name="DischargeTimestamp" type="s" access="read" />
+
+    <!--
+        DeliveryState:
+
+        A <link linkend="MMSmsDeliveryState">MMSmsDeliveryState</link> value,
+        describing the state of the delivery reported in the Status Report message.
+
+        This field is only applicable if the PDU type is
+        <link linkend="MM-SMS-PDU-TYPE-STATUS-REPORT:CAPS"><constant>MM_SMS_PDU_TYPE_STATUS_REPORT</constant></link>.
+    -->
+    <property name="DeliveryState" type="u" access="read" />
+
+    <!--
+        Storage:
+
+        A <link linkend="MMSmsStorage">MMSmsStorage</link> value,
+        describing the storage where this message is kept.
+    -->
+    <property name="Storage" type="u" access="read" />
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager1.xml b/introspection/org.freedesktop.ModemManager1.xml
new file mode 100644
index 0000000..b782177
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2008 Novell, Inc.
+   Copyright (C) 2008-2011 Red Hat, Inc.
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1:
+      @short_description: The ModemManager Manager interface.
+
+      The Manager interface allows controlling and querying the status of the
+      ModemManager daemon.
+  -->
+  <interface name="org.freedesktop.ModemManager1">
+
+    <!--
+        ScanDevices:
+
+        Start a new scan for connected modem devices.
+    -->
+    <method name="ScanDevices" />
+
+    <!--
+        SetLogging:
+        @level: One of <literal>"ERR"</literal>, <literal>"WARN"</literal>, <literal>"INFO"</literal>, <literal>"DEBUG"</literal>.
+
+        Set logging verbosity.
+    -->
+    <method name="SetLogging">
+      <arg name="level" type="s" direction="in" />
+    </method>
+
+  </interface>
+</node>
author	Guido Günther <agx@sigxcpu.org>	2014-02-05 08:38:30 +0100
committer	Guido Günther <agx@sigxcpu.org>	2014-02-05 08:38:30 +0100
commit	13ed135b9ae78c692dc359976eb8b54d0a3629b8 (patch)
tree	ae2ea713ad51d73980cf83db1411d6589dac5e8b /introspection
parent	14d771b90f5a7d3887e5e900d1fb4737477ad305 (diff)