build: disable autogeneration of the 0.5 API header file

But keep it around as a static file, while we do the migration to the new
interface.

6 files changed, 520 insertions, 373 deletions

diff --git a/.gitignore b/.gitignore
index c48bf44a..e07b7149 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@ policy/org.freedesktop.modem-manager.policy
 libqcdm/tests/test-qcdm
 libwmc/tests/test-wmc
 
-include/ModemManager.h
 include/ModemManager-names.h
 
 libmm-common/*.[ch]
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index 9fc2b976..1bf1c38d 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -1,7 +1,6 @@
 
 EXTRA_DIST = \
 	header-generator.xsl \
-	header-generator-new.xsl \
 	mm-enums-types.h.template \
 	mm-enums-types.c.template \
 	mm-enums-errors.h.template \
diff --git a/build-aux/header-generator-new.xsl b/build-aux/header-generator-new.xsl
deleted file mode 100644
index 4cd0dea0..00000000
--- a/build-aux/header-generator-new.xsl
+++ /dev/null
@@ -1,190 +0,0 @@
-<!-- Generate a C header file from the Modem Manager specification.
-
-Copyright (C) 2006, 2007 Collabora Limited
-Copyright (C) 2011 Google, Inc.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library 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
-Lesser General Public License for more details.
-
-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 St, Fifth Floor, Boston, MA  02110-1301  USA
--->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
-  exclude-result-prefixes="tp">
-
-  <!--Don't move the declaration of the HTML namespace up here - XMLNSs
-  don't work ideally in the presence of two things that want to use the
-  absence of a prefix, sadly. -->
-
-  <xsl:strip-space elements="node interface"/>
-  <xsl:template match="*" mode="identity">
-    <xsl:copy>
-      <xsl:apply-templates mode="identity"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="signal">
-    <xsl:variable name="varname">
-      <xsl:value-of select="translate(@name,
-			    'abcdefghijklmnopqrstuvwxyz. ',
-			    'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-    </xsl:variable>
-    <xsl:variable name="intname">
-      <xsl:choose>
-        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
-          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
-			       'abcdefghijklmnopqrstuvwxyz. ',
-			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-         </xsl:when>
-         <xsl:otherwise>
-           <xsl:text>MANAGER</xsl:text>
-         </xsl:otherwise>
-       </xsl:choose>
-    </xsl:variable>
-#define <xsl:value-of select="concat('MM_', $intname, '_SIGNAL_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
-
-  <xsl:template match="property">
-    <xsl:variable name="varname">
-      <xsl:value-of select="translate(@name,
-			    'abcdefghijklmnopqrstuvwxyz. ',
-			    'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-    </xsl:variable>
-    <xsl:variable name="intname">
-      <xsl:choose>
-        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
-          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
-			       'abcdefghijklmnopqrstuvwxyz. ',
-			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-         </xsl:when>
-         <xsl:otherwise>
-           <xsl:text>MANAGER</xsl:text>
-         </xsl:otherwise>
-       </xsl:choose>
-    </xsl:variable>
-#define <xsl:value-of select="concat('MM_', $intname, '_PROPERTY_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
-
-  <xsl:template match="method">
-    <xsl:variable name="varname">
-      <xsl:value-of select="translate(@name,
-			    'abcdefghijklmnopqrstuvwxyz. ',
-                            'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-    </xsl:variable>
-    <xsl:variable name="intname">
-      <xsl:choose>
-        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
-          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
-			       'abcdefghijklmnopqrstuvwxyz. ',
-			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-         </xsl:when>
-         <xsl:otherwise>
-           <xsl:text>MANAGER</xsl:text>
-         </xsl:otherwise>
-       </xsl:choose>
-    </xsl:variable>
-#define <xsl:value-of select="concat('MM_', $intname, '_METHOD_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
-
-  <xsl:output method="text" indent="no" encoding="ascii"
-    omit-xml-declaration="yes" />
-
-  <xsl:template match="/tp:spec">
-/* Generated Header file do not edit */
-
-/*
- * ModemManager Interface Specification
- * Version 0.6
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * 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.
- *
- * Copyright (C) 2008 - 2009 Novell, Inc.
- * Copyright (C) 2009 - 2011 Red Hat, Inc.
- * Copyright (C) 2011 Google, Inc.
- */
-
-#ifndef _MODEM_MANAGER_NAMES_H_
-#define _MODEM_MANAGER_NAMES_H_
-
-#define MM_DBUS_PATH    "/org/freedesktop/ModemManager1"
-#define MM_DBUS_SERVICE "org.freedesktop.ModemManager1"
-
-/**************
- * Interfaces *
- **************/
-<xsl:for-each select="node/interface">
-  <xsl:apply-templates select="tp:docstring"/>
-  <xsl:variable name="varname">
-    <xsl:choose>
-      <xsl:when test="starts-with(@name, 'org.freedesktop.ModemManager1.')">
-        <xsl:value-of select="translate(substring-after(@name, 'org.freedesktop.ModemManager1.'),
-                              'abcdefghijklmnopqrstuvwxyz. ',
-                              'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text></xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="prefix">
-    <xsl:choose>
-      <xsl:when test="string-length($varname) > 0">
-        <xsl:text>_</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text></xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:if test="starts-with(@name, 'org.freedesktop.ModemManager1')">
-#define <xsl:value-of select="concat('MM_DBUS_INTERFACE', $prefix, $varname)"/> "<xsl:value-of select="@name"/>"</xsl:if></xsl:for-each>
-
-/******************************
- * Methods/Signals/Properties *
- ******************************/
-<xsl:for-each select="node/interface">
-/*
- * Interface '<xsl:value-of select="@name"/>'
- */
- <xsl:apply-templates select="method"/>
- <xsl:if test="count(method[*])!=0">
-   <xsl:text></xsl:text>
- </xsl:if>
- <xsl:apply-templates select="signal"/>
- <xsl:if test="count(signal[*])!=0">
-   <xsl:text></xsl:text>
- </xsl:if>
- <xsl:apply-templates select="property"/>
- <xsl:if test="count(property[*])!=0">
-   <xsl:text></xsl:text>
- </xsl:if>
-</xsl:for-each>
-
-#endif /*  _MODEM_MANAGER_NAMES_H_ */
-
-<!-- Ensure that the file ends with a newline -->
-<xsl:text>
-</xsl:text>
-</xsl:template>
-</xsl:stylesheet>
-
-<!-- vim:set sw=2 sts=2 et: -->
diff --git a/build-aux/header-generator.xsl b/build-aux/header-generator.xsl
index b97416c8..4cd0dea0 100644
--- a/build-aux/header-generator.xsl
+++ b/build-aux/header-generator.xsl
@@ -1,6 +1,7 @@
 <!-- Generate a C header file from the Modem Manager specification.
 
 Copyright (C) 2006, 2007 Collabora Limited
+Copyright (C) 2011 Google, Inc.
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -19,148 +20,39 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
   exclude-result-prefixes="tp">
+
   <!--Don't move the declaration of the HTML namespace up here - XMLNSs
   don't work ideally in the presence of two things that want to use the
   absence of a prefix, sadly. -->
 
-  <xsl:strip-space elements="node interface property tp:errors tp:mapping tp:member"/>
+  <xsl:strip-space elements="node interface"/>
   <xsl:template match="*" mode="identity">
     <xsl:copy>
       <xsl:apply-templates mode="identity"/>
     </xsl:copy>
   </xsl:template>
-  <xsl:template name="CamelCase">
-    <xsl:param name="text" />
-    <xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'"/>
-    <xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
-    <xsl:if test="$text">
-      <!-- get word to title-case -->
-      <xsl:variable name="word">
-	<xsl:choose>
-	  <xsl:when test="contains($text, '_')">
-	    <xsl:value-of select="substring-before($text, '_')"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="$text"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:variable>
-      <!-- uppercase first character in word -->
-      <xsl:value-of select="translate(substring($word,1,1), $lowercase, $uppercase)"/>
-      <!-- lowercase all remaining characters in word -->
-      <xsl:value-of select="translate(substring($word,2), $uppercase, $lowercase)"/>
-      <!-- if any next chunk, recall template -->
-      <xsl:call-template name="CamelCase">
-	<xsl:with-param name="text" select="substring-after(substring($text,2), '_')"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="tp:docstring">
-  </xsl:template>
-  <xsl:template match="tp:realdocstring">
-/* <xsl:apply-templates select="node()" mode="identity"/> */
-  </xsl:template>
-  <xsl:template match="tp:errors">
-    <xsl:apply-templates/>
-  </xsl:template>
-  <xsl:template match="tp:generic-types">
-    <xsl:call-template name="do-types"/>
-  </xsl:template>
-  <xsl:template name="do-types">
-    <xsl:if test="tp:simple-type">
-      <xsl:apply-templates select="tp:simple-type"/>
-    </xsl:if>
-    <xsl:if test="tp:enum">
-      <xsl:apply-templates select="tp:enum"/>
-    </xsl:if>
-    <xsl:if test="tp:flags">
-      <xsl:apply-templates select="tp:flags"/>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="tp:error">
-    <xsl:apply-templates select="tp:docstring"/>
-    <xsl:variable name="nameprefix">
-        <xsl:value-of select="translate(substring-after(../@namespace, 'org.freedesktop.ModemManager.'),
-			      'abcdefghijklmnopqrstuvwxyz. ',
-			      'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-      </xsl:variable>
-    <xsl:variable name="name">
+
+  <xsl:template match="signal">
+    <xsl:variable name="varname">
       <xsl:value-of select="translate(@name,
 			    'abcdefghijklmnopqrstuvwxyz. ',
-			    'ABCDEFGHIJKLMNOPQRSTUVWXYZ__')"/>
-      </xsl:variable>
-#define <xsl:value-of select="concat('MM_ERROR_', $nameprefix, '_', $name)"/> "<xsl:value-of select="translate(@name, ' ', '')"/>"</xsl:template>
-
-  <xsl:template match="tp:flags">
-/* <xsl:value-of select="@name"/> flag values */
-    <xsl:apply-templates select="tp:docstring" />
-    <xsl:variable name="value-prefix">
-      <xsl:choose>
-	<xsl:when test="@value-prefix">
-	  <xsl:value-of select="@value-prefix"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="@name"/>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="enum-name">
-      <xsl:call-template name="CamelCase">
-	<xsl:with-param name="text" select="substring-after(@name,'MM_')"/>
-      </xsl:call-template>
+			    'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
     </xsl:variable>
-typedef enum {
-<xsl:for-each select="tp:flag">
-<xsl:text>    </xsl:text><xsl:value-of select="concat($value-prefix, '_', @suffix)"/><xsl:text> = </xsl:text><xsl:value-of select="@value"/><xsl:text>,
-</xsl:text>
-</xsl:for-each>
-<xsl:text>} </xsl:text><xsl:value-of select="concat('MM',$enum-name)"/><xsl:text>;
-</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="tp:enum">
-/* <xsl:value-of select="@name"/> enum values */
-    <xsl:apply-templates select="tp:docstring" />
-    <xsl:variable name="value-prefix">
+    <xsl:variable name="intname">
       <xsl:choose>
-	<xsl:when test="@value-prefix">
-	  <xsl:value-of select="@value-prefix"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="@name"/>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="enum-name">
-      <xsl:call-template name="CamelCase">
-	<xsl:with-param name="text" select="substring-after(@name,'MM_')"/>
-      </xsl:call-template>
+        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
+          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
+			       'abcdefghijklmnopqrstuvwxyz. ',
+			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
+         </xsl:when>
+         <xsl:otherwise>
+           <xsl:text>MANAGER</xsl:text>
+         </xsl:otherwise>
+       </xsl:choose>
     </xsl:variable>
-typedef enum {
-<xsl:for-each select="tp:enumvalue">
-<xsl:text>    </xsl:text><xsl:value-of select="concat($value-prefix, '_', @suffix)"/><xsl:text> = </xsl:text><xsl:value-of select="@value"/><xsl:text>,
-</xsl:text>
-</xsl:for-each>
-<xsl:text>} </xsl:text><xsl:value-of select="concat('MM',$enum-name)"/><xsl:text>;
-</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="tp:possible-errors/tp:error">
-    <xsl:variable name="name" select="@name"/>
-    <xsl:choose>
-      <xsl:when test="tp:docstring">
-        <xsl:apply-templates select="tp:docstring"/>
-      </xsl:when>
-      <xsl:when test="//tp:errors/tp:error[concat(../@namespace, '.', translate(@name, ' ', ''))=$name]/tp:docstring">
-        <xsl:apply-templates select="//tp:errors/tp:error[concat(../@namespace, '.', translate(@name, ' ', ''))=$name]/tp:docstring"/> <em xmlns="http://www.w3.org/1999/xhtml">(generic description)</em>
-      </xsl:when>
-      <xsl:otherwise>
-        (Undocumented.)
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
+#define <xsl:value-of select="concat('MM_', $intname, '_SIGNAL_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
 
-  <xsl:template match="signal">
+  <xsl:template match="property">
     <xsl:variable name="varname">
       <xsl:value-of select="translate(@name,
 			    'abcdefghijklmnopqrstuvwxyz. ',
@@ -168,8 +60,8 @@ typedef enum {
     </xsl:variable>
     <xsl:variable name="intname">
       <xsl:choose>
-        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager.')">
-          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager.'),
+        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
+          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
 			       'abcdefghijklmnopqrstuvwxyz. ',
 			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
          </xsl:when>
@@ -178,7 +70,7 @@ typedef enum {
          </xsl:otherwise>
        </xsl:choose>
     </xsl:variable>
-#define <xsl:value-of select="concat('MM_', $intname, '_SIGNAL_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
+#define <xsl:value-of select="concat('MM_', $intname, '_PROPERTY_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
 
   <xsl:template match="method">
     <xsl:variable name="varname">
@@ -188,8 +80,8 @@ typedef enum {
     </xsl:variable>
     <xsl:variable name="intname">
       <xsl:choose>
-        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager.')">
-          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager.'),
+        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
+          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
 			       'abcdefghijklmnopqrstuvwxyz. ',
 			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
          </xsl:when>
@@ -200,9 +92,6 @@ typedef enum {
     </xsl:variable>
 #define <xsl:value-of select="concat('MM_', $intname, '_METHOD_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
 
-  <xsl:template match="tp:copyright">
-  </xsl:template>
-
   <xsl:output method="text" indent="no" encoding="ascii"
     omit-xml-declaration="yes" />
 
@@ -210,8 +99,8 @@ typedef enum {
 /* Generated Header file do not edit */
 
 /*
- * <xsl:value-of select="tp:title"/>
- * version <xsl:value-of select="tp:version"/>
+ * ModemManager Interface Specification
+ * Version 0.6
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -230,13 +119,14 @@ typedef enum {
  *
  * Copyright (C) 2008 - 2009 Novell, Inc.
  * Copyright (C) 2009 - 2011 Red Hat, Inc.
+ * Copyright (C) 2011 Google, Inc.
  */
 
-#ifndef _MODEM_MANAGER_H_
-#define _MODEM_MANAGER_H_
+#ifndef _MODEM_MANAGER_NAMES_H_
+#define _MODEM_MANAGER_NAMES_H_
 
-#define MM_DBUS_PATH    "/org/freedesktop/ModemManager"
-#define MM_DBUS_SERVICE "org.freedesktop.ModemManager"
+#define MM_DBUS_PATH    "/org/freedesktop/ModemManager1"
+#define MM_DBUS_SERVICE "org.freedesktop.ModemManager1"
 
 /**************
  * Interfaces *
@@ -245,56 +135,51 @@ typedef enum {
   <xsl:apply-templates select="tp:docstring"/>
   <xsl:variable name="varname">
     <xsl:choose>
-      <xsl:when test="starts-with(@name, 'org.freedesktop.ModemManager.')">
-	<xsl:value-of select="translate(substring-after(@name, 'org.freedesktop.ModemManager.'),
-			      'abcdefghijklmnopqrstuvwxyz. ',
-			      'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
+      <xsl:when test="starts-with(@name, 'org.freedesktop.ModemManager1.')">
+        <xsl:value-of select="translate(substring-after(@name, 'org.freedesktop.ModemManager1.'),
+                              'abcdefghijklmnopqrstuvwxyz. ',
+                              'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
       </xsl:when>
       <xsl:otherwise>
-	<xsl:text></xsl:text>
+        <xsl:text></xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
   <xsl:variable name="prefix">
     <xsl:choose>
       <xsl:when test="string-length($varname) > 0">
-	<xsl:text>_</xsl:text>
+        <xsl:text>_</xsl:text>
       </xsl:when>
       <xsl:otherwise>
-	<xsl:text></xsl:text>
+        <xsl:text></xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
-  <xsl:if test="starts-with(@name, 'org.freedesktop.ModemManager')">
+  <xsl:if test="starts-with(@name, 'org.freedesktop.ModemManager1')">
 #define <xsl:value-of select="concat('MM_DBUS_INTERFACE', $prefix, $varname)"/> "<xsl:value-of select="@name"/>"</xsl:if></xsl:for-each>
 
-/***********************
- * Methods/Enums/Flags *
- ***********************/
+/******************************
+ * Methods/Signals/Properties *
+ ******************************/
 <xsl:for-each select="node/interface">
 /*
- * Interface <xsl:value-of select="@name"/>
+ * Interface '<xsl:value-of select="@name"/>'
  */
-  <xsl:apply-templates select="method"/>
-  <xsl:if test="count(method[*])!=0">
-  <xsl:text>
-</xsl:text>
-  </xsl:if>
-  <xsl:apply-templates select="signal"/>
-  <xsl:if test="count(signal[*])!=0">
-  <xsl:text>
-</xsl:text>
-  </xsl:if>
-  <xsl:apply-templates select="tp:enum"/>
-  <xsl:apply-templates select="tp:flags"/>
+ <xsl:apply-templates select="method"/>
+ <xsl:if test="count(method[*])!=0">
+   <xsl:text></xsl:text>
+ </xsl:if>
+ <xsl:apply-templates select="signal"/>
+ <xsl:if test="count(signal[*])!=0">
+   <xsl:text></xsl:text>
+ </xsl:if>
+ <xsl:apply-templates select="property"/>
+ <xsl:if test="count(property[*])!=0">
+   <xsl:text></xsl:text>
+ </xsl:if>
 </xsl:for-each>
 
-/**********
- * Errors *
- **********/
-<xsl:apply-templates select="tp:errors"/>
-
-#endif /*  _MODEM_MANAGER_H_ */
+#endif /*  _MODEM_MANAGER_NAMES_H_ */
 
 <!-- Ensure that the file ends with a newline -->
 <xsl:text>
diff --git a/include/Makefile.am b/include/Makefile.am
index 615b9052..a5b71660 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,6 @@
 XSLTPROC = xsltproc --xinclude --nonet
 
-OLD_XMLS = $(wildcard $(top_srcdir)/introspection/*.xml)
-NEW_XMLS = $(wildcard $(top_srcdir)/new/*.xml)
+XMLS = $(wildcard $(top_srcdir)/new/*.xml)
 
 includedir = @includedir@/mm
 
@@ -12,13 +11,8 @@ include_HEADERS = \
 	ModemManager1.h \
 	ModemManager.h
 
-# NOTE: This is the header of the 0.5 API, which will get removed
-ModemManager.h: $(OLD_XMLS) $(top_srcdir)/introspection/all.xml $(top_srcdir)/build-aux/header-generator.xsl
-	$(AM_V_GEN) $(XSLTPROC) $(top_srcdir)/build-aux/header-generator.xsl $(top_srcdir)/introspection/all.xml > $@
-
-ModemManager-names.h: $(NEW_XMLS) $(top_srcdir)/new/all.xml $(top_srcdir)/build-aux/header-generator-new.xsl
-	$(AM_V_GEN) $(XSLTPROC) $(top_srcdir)/build-aux/header-generator-new.xsl $(top_srcdir)/new/all.xml > $@
+ModemManager-names.h: $(XMLS) $(top_srcdir)/new/all.xml $(top_srcdir)/build-aux/header-generator.xsl
+	$(AM_V_GEN) $(XSLTPROC) $(top_srcdir)/build-aux/header-generator.xsl $(top_srcdir)/new/all.xml > $@
 
 CLEANFILES = \
-	ModemManager-names.h \
-	ModemManager.h
+	ModemManager-names.h
diff --git a/include/ModemManager.h b/include/ModemManager.h
new file mode 100644
index 00000000..ebddb24b
--- /dev/null
+++ b/include/ModemManager.h
@@ -0,0 +1,460 @@
+/*
+ * ModemManager Interface Specification
+ * version 0.5
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * 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.
+ *
+ * Copyright (C) 2008 - 2009 Novell, Inc.
+ * Copyright (C) 2009 - 2011 Red Hat, Inc.
+ */
+
+#ifndef _MODEM_MANAGER_H_
+#define _MODEM_MANAGER_H_
+
+#define MM_DBUS_PATH    "/org/freedesktop/ModemManager"
+#define MM_DBUS_SERVICE "org.freedesktop.ModemManager"
+
+/**************
+ * Interfaces *
+ **************/
+
+#define MM_DBUS_INTERFACE "org.freedesktop.ModemManager"
+#define MM_DBUS_INTERFACE_MODEM "org.freedesktop.ModemManager.Modem"
+#define MM_DBUS_INTERFACE_MODEM_SIMPLE "org.freedesktop.ModemManager.Modem.Simple"
+#define MM_DBUS_INTERFACE_MODEM_FIRMWARE "org.freedesktop.ModemManager.Modem.Firmware"
+#define MM_DBUS_INTERFACE_MODEM_LOCATION "org.freedesktop.ModemManager.Modem.Location"
+#define MM_DBUS_INTERFACE_MODEM_CDMA "org.freedesktop.ModemManager.Modem.Cdma"
+#define MM_DBUS_INTERFACE_MODEM_GSM "org.freedesktop.ModemManager.Modem.Gsm"
+#define MM_DBUS_INTERFACE_MODEM_GSM_CARD "org.freedesktop.ModemManager.Modem.Gsm.Card"
+#define MM_DBUS_INTERFACE_MODEM_GSM_CONTACTS "org.freedesktop.ModemManager.Modem.Gsm.Contacts"
+#define MM_DBUS_INTERFACE_MODEM_GSM_NETWORK "org.freedesktop.ModemManager.Modem.Gsm.Network"
+#define MM_DBUS_INTERFACE_MODEM_GSM_SMS "org.freedesktop.ModemManager.Modem.Gsm.SMS"
+#define MM_DBUS_INTERFACE_MODEM_GSM_HSO "org.freedesktop.ModemManager.Modem.Gsm.Hso"
+#define MM_DBUS_INTERFACE_MODEM_GSM_USSD "org.freedesktop.ModemManager.Modem.Gsm.Ussd"
+
+/***********************
+ * Methods/Enums/Flags *
+ ***********************/
+
+/*
+ * Interface org.freedesktop.ModemManager
+ */
+
+#define MM_MANAGER_METHOD_ENUMERATEDEVICES "EnumerateDevices"
+#define MM_MANAGER_METHOD_SCANDEVICES "ScanDevices"
+#define MM_MANAGER_METHOD_SETLOGGING "SetLogging"
+
+#define MM_MANAGER_SIGNAL_DEVICEADDED "DeviceAdded"
+#define MM_MANAGER_SIGNAL_DEVICEREMOVED "DeviceRemoved"
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem
+ */
+
+#define MM_MODEM_METHOD_ENABLE "Enable"
+#define MM_MODEM_METHOD_CONNECT "Connect"
+#define MM_MODEM_METHOD_DISCONNECT "Disconnect"
+#define MM_MODEM_METHOD_GETIP4CONFIG "GetIP4Config"
+#define MM_MODEM_METHOD_GETINFO "GetInfo"
+#define MM_MODEM_METHOD_RESET "Reset"
+#define MM_MODEM_METHOD_FACTORYRESET "FactoryReset"
+
+#define MM_MODEM_SIGNAL_STATECHANGED "StateChanged"
+
+/* MM_MODEM_TYPE enum values */
+
+typedef enum {
+    MM_MODEM_TYPE_UNKNOWN = 0,
+    MM_MODEM_TYPE_GSM = 1,
+    MM_MODEM_TYPE_CDMA = 2,
+} MMModemType;
+
+/* MM_MODEM_IP_METHOD enum values */
+
+typedef enum {
+    MM_MODEM_IP_METHOD_PPP = 0,
+    MM_MODEM_IP_METHOD_STATIC = 1,
+    MM_MODEM_IP_METHOD_DHCP = 2,
+} MMModemIpMethod;
+
+/* MM_MODEM_STATE enum values */
+
+typedef enum {
+    MM_MODEM_STATE_UNKNOWN = 0,
+    MM_MODEM_STATE_DISABLED = 10,
+    MM_MODEM_STATE_DISABLING = 20,
+    MM_MODEM_STATE_ENABLING = 30,
+    MM_MODEM_STATE_ENABLED = 40,
+    MM_MODEM_STATE_SEARCHING = 50,
+    MM_MODEM_STATE_REGISTERED = 60,
+    MM_MODEM_STATE_DISCONNECTING = 70,
+    MM_MODEM_STATE_CONNECTING = 80,
+    MM_MODEM_STATE_CONNECTED = 90,
+} MMModemState;
+
+/* MM_MODEM_STATE_REASON enum values */
+
+typedef enum {
+    MM_MODEM_STATE_REASON_NONE = 0,
+    MM_MODEM_STATE_REASON_USER_REQUESTED = 1,
+    MM_MODEM_STATE_REASON_SUSPEND = 2,
+} MMModemStateReason;
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem.Simple
+ */
+
+#define MM_MODEM_SIMPLE_METHOD_CONNECT "Connect"
+#define MM_MODEM_SIMPLE_METHOD_GETSTATUS "GetStatus"
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem.Firmware
+ */
+
+#define MM_MODEM_FIRMWARE_METHOD_LIST "List"
+#define MM_MODEM_FIRMWARE_METHOD_SELECT "Select"
+#define MM_MODEM_FIRMWARE_METHOD_INSTALL "Install"
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem.Location
+ */
+
+#define MM_MODEM_LOCATION_METHOD_ENABLE "Enable"
+#define MM_MODEM_LOCATION_METHOD_GETLOCATION "GetLocation"
+
+/* MM_MODEM_LOCATION_CAPABILITIES flag values */
+
+typedef enum {
+    MM_MODEM_LOCATION_CAPABILITY_UNKNOWN = 0x0,
+    MM_MODEM_LOCATION_CAPABILITY_GPS_NMEA = 0x1,
+    MM_MODEM_LOCATION_CAPABILITY_GSM_LAC_CI = 0x2,
+    MM_MODEM_LOCATION_CAPABILITY_GPS_RAW = 0x4,
+} MMModemLocationCapabilities;
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem.Cdma
+ */
+
+#define MM_MODEM_CDMA_METHOD_ACTIVATE "Activate"
+#define MM_MODEM_CDMA_METHOD_ACTIVATEMANUAL "ActivateManual"
+#define MM_MODEM_CDMA_METHOD_GETSIGNALQUALITY "GetSignalQuality"
+#define MM_MODEM_CDMA_METHOD_GETESN "GetEsn"
+#define MM_MODEM_CDMA_METHOD_GETSERVINGSYSTEM "GetServingSystem"
+#define MM_MODEM_CDMA_METHOD_GETREGISTRATIONSTATE "GetRegistrationState"
+
+#define MM_MODEM_CDMA_SIGNAL_ACTIVATIONSTATECHANGED "ActivationStateChanged"
+#define MM_MODEM_CDMA_SIGNAL_SIGNALQUALITY "SignalQuality"
+#define MM_MODEM_CDMA_SIGNAL_REGISTRATIONSTATECHANGED "RegistrationStateChanged"
+
+/* MM_MODEM_CDMA_REGISTRATION_STATE enum values */
+
+typedef enum {
+    MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN = 0,
+    MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED = 1,
+    MM_MODEM_CDMA_REGISTRATION_STATE_HOME = 2,
+    MM_MODEM_CDMA_REGISTRATION_STATE_ROAMING = 3,
+} MMModemCdmaRegistrationState;
+
+/* MM_MODEM_CDMA_ACTIVATION_STATE enum values */
+
+typedef enum {
+    MM_MODEM_CDMA_ACTIVATION_STATE_NOT_ACTIVATED = 0,
+    MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATING = 1,
+    MM_MODEM_CDMA_ACTIVATION_STATE_PARTIALLY_ACTIVATED = 2,
+    MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATED = 3,
+} MMModemCdmaActivationState;
+
+/* MM_MODEM_CDMA_ACTIVATION_ERROR enum values */
+
+typedef enum {
+    MM_MODEM_CDMA_ACTIVATION_ERROR_NO_ERROR = 0,
+    MM_MODEM_CDMA_ACTIVATION_ERROR_ROAMING = 1,
+    MM_MODEM_CDMA_ACTIVATION_ERROR_WRONG_RADIO_INTERFACE = 2,
+    MM_MODEM_CDMA_ACTIVATION_ERROR_COULD_NOT_CONNECT = 3,
+    MM_MODEM_CDMA_ACTIVATION_ERROR_SECURITY_AUTHENTICATION_FAILED = 4,
+    MM_MODEM_CDMA_ACTIVATION_ERROR_PROVISIONING_FAILED = 5,
+    MM_MODEM_CDMA_ACTIVATION_ERROR_NO_SIGNAL = 6,
+    MM_MODEM_CDMA_ACTIVATION_ERROR_UNKNOWN = 7,
+    MM_MODEM_CDMA_ACTIVATION_ERROR_TIMED_OUT = 8,
+    MM_MODEM_CDMA_ACTIVATION_ERROR_START_FAILED = 9,
+} MMModemCdmaActivationError;
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem.Gsm
+ */
+
+/* MM_MODEM_GSM_ALLOWED_MODE enum values */
+
+typedef enum {
+    MM_MODEM_GSM_ALLOWED_MODE_ANY = 0,
+    MM_MODEM_GSM_ALLOWED_MODE_2G_PREFERRED = 1,
+    MM_MODEM_GSM_ALLOWED_MODE_3G_PREFERRED = 2,
+    MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY = 3,
+    MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY = 4,
+} MMModemGsmAllowedMode;
+
+/* MM_MODEM_GSM_ACCESS_TECH enum values */
+
+typedef enum {
+    MM_MODEM_GSM_ACCESS_TECH_UNKNOWN = 0,
+    MM_MODEM_GSM_ACCESS_TECH_GSM = 1,
+    MM_MODEM_GSM_ACCESS_TECH_GSM_COMPACT = 2,
+    MM_MODEM_GSM_ACCESS_TECH_GPRS = 3,
+    MM_MODEM_GSM_ACCESS_TECH_EDGE = 4,
+    MM_MODEM_GSM_ACCESS_TECH_UMTS = 5,
+    MM_MODEM_GSM_ACCESS_TECH_HSDPA = 6,
+    MM_MODEM_GSM_ACCESS_TECH_HSUPA = 7,
+    MM_MODEM_GSM_ACCESS_TECH_HSPA = 8,
+    MM_MODEM_GSM_ACCESS_TECH_HSPA_PLUS = 9,
+    MM_MODEM_GSM_ACCESS_TECH_LTE = 10,
+} MMModemGsmAccessTech;
+
+/* MM_MODEM_GSM_MODE flag values */
+
+typedef enum {
+    MM_MODEM_GSM_MODE_UNKNOWN = 0x0,
+    MM_MODEM_GSM_MODE_ANY = 0x1,
+    MM_MODEM_GSM_MODE_GPRS = 0x2,
+    MM_MODEM_GSM_MODE_EDGE = 0x4,
+    MM_MODEM_GSM_MODE_UMTS = 0x8,
+    MM_MODEM_GSM_MODE_HSDPA = 0x10,
+    MM_MODEM_GSM_MODE_2G_PREFERRED = 0x20,
+    MM_MODEM_GSM_MODE_3G_PREFERRED = 0x40,
+    MM_MODEM_GSM_MODE_2G_ONLY = 0x80,
+    MM_MODEM_GSM_MODE_3G_ONLY = 0x100,
+    MM_MODEM_GSM_MODE_HSUPA = 0x200,
+    MM_MODEM_GSM_MODE_HSPA = 0x400,
+    MM_MODEM_GSM_MODE_GSM = 0x800,
+    MM_MODEM_GSM_MODE_GSM_COMPACT = 0x1000,
+} MMModemGsmMode;
+
+/* MM_MODEM_GSM_BAND flag values */
+
+typedef enum {
+    MM_MODEM_GSM_BAND_UNKNOWN = 0x0,
+    MM_MODEM_GSM_BAND_ANY = 0x1,
+    MM_MODEM_GSM_BAND_EGSM = 0x2,
+    MM_MODEM_GSM_BAND_DCS = 0x4,
+    MM_MODEM_GSM_BAND_PCS = 0x8,
+    MM_MODEM_GSM_BAND_G850 = 0x10,
+    MM_MODEM_GSM_BAND_U2100 = 0x20,
+    MM_MODEM_GSM_BAND_U1800 = 0x40,
+    MM_MODEM_GSM_BAND_U17IV = 0x80,
+    MM_MODEM_GSM_BAND_U800 = 0x100,
+    MM_MODEM_GSM_BAND_U850 = 0x200,
+    MM_MODEM_GSM_BAND_U900 = 0x400,
+    MM_MODEM_GSM_BAND_U17IX = 0x800,
+    MM_MODEM_GSM_BAND_U1900 = 0x1000,
+    MM_MODEM_GSM_BAND_U2600 = 0x2000,
+} MMModemGsmBand;
+
+/* MM_MODEM_GSM_FACILITY flag values */
+
+typedef enum {
+    MM_MODEM_GSM_FACILITY_NONE = 0x0,
+    MM_MODEM_GSM_FACILITY_SIM = 0x1,
+    MM_MODEM_GSM_FACILITY_FIXED_DIALING = 0x2,
+    MM_MODEM_GSM_FACILITY_PH_SIM = 0x4,
+    MM_MODEM_GSM_FACILITY_PH_FSIM = 0x8,
+    MM_MODEM_GSM_FACILITY_NET_PERS = 0x10,
+    MM_MODEM_GSM_FACILITY_NET_SUB_PERS = 0x20,
+    MM_MODEM_GSM_FACILITY_PROVIDER_PERS = 0x40,
+    MM_MODEM_GSM_FACILITY_CORP_PERS = 0x80,
+} MMModemGsmFacility;
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem.Gsm.Card
+ */
+
+#define MM_MODEM_GSM_CARD_METHOD_GETIMEI "GetImei"
+#define MM_MODEM_GSM_CARD_METHOD_GETIMSI "GetImsi"
+#define MM_MODEM_GSM_CARD_METHOD_GETOPERATORID "GetOperatorId"
+#define MM_MODEM_GSM_CARD_METHOD_GETSPN "GetSpn"
+#define MM_MODEM_GSM_CARD_METHOD_SENDPUK "SendPuk"
+#define MM_MODEM_GSM_CARD_METHOD_SENDPIN "SendPin"
+#define MM_MODEM_GSM_CARD_METHOD_ENABLEPIN "EnablePin"
+#define MM_MODEM_GSM_CARD_METHOD_CHANGEPIN "ChangePin"
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem.Gsm.Contacts
+ */
+
+#define MM_MODEM_GSM_CONTACTS_METHOD_ADD "Add"
+#define MM_MODEM_GSM_CONTACTS_METHOD_DELETE "Delete"
+#define MM_MODEM_GSM_CONTACTS_METHOD_GET "Get"
+#define MM_MODEM_GSM_CONTACTS_METHOD_LIST "List"
+#define MM_MODEM_GSM_CONTACTS_METHOD_FIND "Find"
+#define MM_MODEM_GSM_CONTACTS_METHOD_GETCOUNT "GetCount"
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem.Gsm.Network
+ */
+
+#define MM_MODEM_GSM_NETWORK_METHOD_REGISTER "Register"
+#define MM_MODEM_GSM_NETWORK_METHOD_SCAN "Scan"
+#define MM_MODEM_GSM_NETWORK_METHOD_SETAPN "SetApn"
+#define MM_MODEM_GSM_NETWORK_METHOD_GETSIGNALQUALITY "GetSignalQuality"
+#define MM_MODEM_GSM_NETWORK_METHOD_SETBAND "SetBand"
+#define MM_MODEM_GSM_NETWORK_METHOD_GETBAND "GetBand"
+#define MM_MODEM_GSM_NETWORK_METHOD_SETNETWORKMODE "SetNetworkMode"
+#define MM_MODEM_GSM_NETWORK_METHOD_GETNETWORKMODE "GetNetworkMode"
+#define MM_MODEM_GSM_NETWORK_METHOD_GETREGISTRATIONINFO "GetRegistrationInfo"
+#define MM_MODEM_GSM_NETWORK_METHOD_SETALLOWEDMODE "SetAllowedMode"
+
+#define MM_MODEM_GSM_NETWORK_SIGNAL_SIGNALQUALITY "SignalQuality"
+#define MM_MODEM_GSM_NETWORK_SIGNAL_REGISTRATIONINFO "RegistrationInfo"
+#define MM_MODEM_GSM_NETWORK_SIGNAL_NETWORKMODE "NetworkMode"
+
+/* MM_MODEM_GSM_NETWORK_REG_STATUS enum values */
+
+typedef enum {
+    MM_MODEM_GSM_NETWORK_REG_STATUS_IDLE = 0,
+    MM_MODEM_GSM_NETWORK_REG_STATUS_HOME = 1,
+    MM_MODEM_GSM_NETWORK_REG_STATUS_SEARCHING = 2,
+    MM_MODEM_GSM_NETWORK_REG_STATUS_DENIED = 3,
+    MM_MODEM_GSM_NETWORK_REG_STATUS_UNKNOWN = 4,
+    MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING = 5,
+} MMModemGsmNetworkRegStatus;
+
+/* MM_MODEM_GSM_NETWORK_DEPRECATED_MODE enum values */
+
+typedef enum {
+    MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_ANY = 0,
+    MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_GPRS = 1,
+    MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_EDGE = 2,
+    MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_UMTS = 3,
+    MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSDPA = 4,
+    MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_2G_PREFERRED = 5,
+    MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_3G_PREFERRED = 6,
+    MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_2G_ONLY = 7,
+    MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_3G_ONLY = 8,
+    MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSUPA = 9,
+    MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSPA = 10,
+} MMModemGsmNetworkDeprecatedMode;
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem.Gsm.SMS
+ */
+
+#define MM_MODEM_GSM_SMS_METHOD_DELETE "Delete"
+#define MM_MODEM_GSM_SMS_METHOD_GET "Get"
+#define MM_MODEM_GSM_SMS_METHOD_GETFORMAT "GetFormat"
+#define MM_MODEM_GSM_SMS_METHOD_SETFORMAT "SetFormat"
+#define MM_MODEM_GSM_SMS_METHOD_GETSMSC "GetSmsc"
+#define MM_MODEM_GSM_SMS_METHOD_SETSMSC "SetSmsc"
+#define MM_MODEM_GSM_SMS_METHOD_LIST "List"
+#define MM_MODEM_GSM_SMS_METHOD_SAVE "Save"
+#define MM_MODEM_GSM_SMS_METHOD_SEND "Send"
+#define MM_MODEM_GSM_SMS_METHOD_SENDFROMSTORAGE "SendFromStorage"
+#define MM_MODEM_GSM_SMS_METHOD_SETINDICATION "SetIndication"
+
+#define MM_MODEM_GSM_SMS_SIGNAL_SMSRECEIVED "SmsReceived"
+#define MM_MODEM_GSM_SMS_SIGNAL_COMPLETED "Completed"
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem.Gsm.Hso
+ */
+
+#define MM_MODEM_GSM_HSO_METHOD_AUTHENTICATE "Authenticate"
+
+/*
+ * Interface org.freedesktop.ModemManager.Modem.Gsm.Ussd
+ */
+
+#define MM_MODEM_GSM_USSD_METHOD_INITIATE "Initiate"
+#define MM_MODEM_GSM_USSD_METHOD_RESPOND "Respond"
+#define MM_MODEM_GSM_USSD_METHOD_CANCEL "Cancel"
+
+/*
+ * Interface org.freedesktop.DBus.Properties
+ */
+
+#define MM_MANAGER_SIGNAL_MMPROPERTIESCHANGED "MmPropertiesChanged"
+#define MM_MANAGER_SIGNAL_PROPERTIESCHANGED "PropertiesChanged"
+
+
+/**********
+ * Errors *
+ **********/
+
+#define MM_ERROR_MODEM_SERIALOPENFAILED "SerialOpenFailed"
+#define MM_ERROR_MODEM_SERIALSENDFAILED "SerialSendFailed"
+#define MM_ERROR_MODEM_SERIALRESPONSETIMEOUT "SerialResponseTimeout"
+#define MM_ERROR_MODEM_GENERAL "General"
+#define MM_ERROR_MODEM_OPERATIONNOTSUPPORTED "OperationNotSupported"
+#define MM_ERROR_MODEM_CONNECTED "Connected"
+#define MM_ERROR_MODEM_DISCONNECTED "Disconnected"
+#define MM_ERROR_MODEM_OPERATIONINPROGRESS "OperationInProgress"
+#define MM_ERROR_MODEM_NOCARRIER "NoCarrier"
+#define MM_ERROR_MODEM_NODIALTONE "NoDialtone"
+#define MM_ERROR_MODEM_BUSY "Busy"
+#define MM_ERROR_MODEM_NOANSWER "NoAnswer"
+#define MM_ERROR_MODEM_GSM_PHONEFAILURE "PhoneFailure"
+#define MM_ERROR_MODEM_GSM_NOCONNECTION "NoConnection"
+#define MM_ERROR_MODEM_GSM_LINKRESERVED "LinkReserved"
+#define MM_ERROR_MODEM_GSM_OPERATIONNOTALLOWED "OperationNotAllowed"
+#define MM_ERROR_MODEM_GSM_OPERATIONNOTSUPPORTED "OperationNotSupported"
+#define MM_ERROR_MODEM_GSM_PHSIMPINREQUIRED "PhSimPinRequired"
+#define MM_ERROR_MODEM_GSM_PHFSIMPINREQUIRED "PhFSimPinRequired"
+#define MM_ERROR_MODEM_GSM_PHFSIMPUKREQUIRED "PhFSimPukRequired"
+#define MM_ERROR_MODEM_GSM_SIMNOTINSERTED "SimNotInserted"
+#define MM_ERROR_MODEM_GSM_SIMPINREQUIRED "SimPinRequired"
+#define MM_ERROR_MODEM_GSM_SIMPUKREQUIRED "SimPukRequired"
+#define MM_ERROR_MODEM_GSM_SIMFAILURE "SimFailure"
+#define MM_ERROR_MODEM_GSM_SIMBUSY "SimBusy"
+#define MM_ERROR_MODEM_GSM_SIMWRONG "SimWrong"
+#define MM_ERROR_MODEM_GSM_INCORRECTPASSWORD "IncorrectPassword"
+#define MM_ERROR_MODEM_GSM_SIMPIN2REQUIRED "SimPin2Required"
+#define MM_ERROR_MODEM_GSM_SIMPUK2REQUIRED "SimPuk2Required"
+#define MM_ERROR_MODEM_GSM_MEMORYFULL "MemoryFull"
+#define MM_ERROR_MODEM_GSM_INVALIDINDEX "InvalidIndex"
+#define MM_ERROR_MODEM_GSM_NOTFOUND "NotFound"
+#define MM_ERROR_MODEM_GSM_MEMORYFAILURE "MemoryFailure"
+#define MM_ERROR_MODEM_GSM_TEXTTOOLONG "TextTooLong"
+#define MM_ERROR_MODEM_GSM_INVALIDCHARS "InvalidChars"
+#define MM_ERROR_MODEM_GSM_DIALSTRINGTOOLONG "DialStringTooLong"
+#define MM_ERROR_MODEM_GSM_INVALIDDIALSTRING "InvalidDialString"
+#define MM_ERROR_MODEM_GSM_NONETWORK "NoNetwork"
+#define MM_ERROR_MODEM_GSM_NETWORKTIMEOUT "NetworkTimeout"
+#define MM_ERROR_MODEM_GSM_NETWORKNOTALLOWED "NetworkNotAllowed"
+#define MM_ERROR_MODEM_GSM_NETWORKPINREQUIRED "NetworkPinRequired"
+#define MM_ERROR_MODEM_GSM_NETWORKPUKREQUIRED "NetworkPukRequired"
+#define MM_ERROR_MODEM_GSM_NETWORKSUBSETPINREQUIRED "NetworkSubsetPinRequired"
+#define MM_ERROR_MODEM_GSM_NETWORKSUBSETPUKREQUIRED "NetworkSubsetPukRequired"
+#define MM_ERROR_MODEM_GSM_SERVICEPINREQUIRED "ServicePinRequired"
+#define MM_ERROR_MODEM_GSM_SERVICEPUKREQUIRED "ServicePukRequired"
+#define MM_ERROR_MODEM_GSM_CORPORATEPINREQUIRED "CorporatePinRequired"
+#define MM_ERROR_MODEM_GSM_CORPORATEPUKREQUIRED "CorporatePukRequired"
+#define MM_ERROR_MODEM_GSM_HIDDENKEYREQUIRED "HiddenKeyRequired"
+#define MM_ERROR_MODEM_GSM_EAPMETHODNOTSUPPORTED "EapMethodNotSupported"
+#define MM_ERROR_MODEM_GSM_INCORRECTPARAMS "IncorrectParams"
+#define MM_ERROR_MODEM_GSM_UNKNOWN "Unknown"
+#define MM_ERROR_MODEM_GSM_GPRSILLEGALMS "GprsIllegalMs"
+#define MM_ERROR_MODEM_GSM_GPRSILLEGALME "GprsIllegalMe"
+#define MM_ERROR_MODEM_GSM_GPRSSERVICENOTALLOWED "GprsServiceNotAllowed"
+#define MM_ERROR_MODEM_GSM_GPRSPLMNNOTALLOWED "GprsPlmnNotAllowed"
+#define MM_ERROR_MODEM_GSM_GPRSLOCATIONNOTALLOWED "GprsLocationNotAllowed"
+#define MM_ERROR_MODEM_GSM_GPRSROAMINGNOTALLOWED "GprsRoamingNotAllowed"
+#define MM_ERROR_MODEM_GSM_GPRSOPTIONNOTSUPPORTED "GprsOptionNotSupported"
+#define MM_ERROR_MODEM_GSM_GPRSNOTSUBSCRIBED "GprsNotSubscribed"
+#define MM_ERROR_MODEM_GSM_GPRSOUTOFORDER "GprsOutOfOrder"
+#define MM_ERROR_MODEM_GSM_GPRSPDPAUTHFAILURE "GprsPdpAuthFailure"
+#define MM_ERROR_MODEM_GSM_GPRSUNSPECIFIED "GprsUnspecified"
+#define MM_ERROR_MODEM_GSM_GPRSINVALIDCLASS "GprsInvalidClass"
+
+#endif /*  _MODEM_MANAGER_H_ */
+
+