From 71fbd2248c20d583300259648703df2f81139dac Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Thu, 12 Jan 2012 16:42:29 +0100
Subject: [PATCH] api,dbus: prefix with 'm3gpp' the 3GPP-specific entries
 returned in the simple status

Note that we cannot have properties starting with a digit :-/
---
 libmm-common/mm-common-simple-properties.h    |  7 ++--
 ...freedesktop.ModemManager1.Modem.Simple.xml | 40 +++++++++----------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/libmm-common/mm-common-simple-properties.h b/libmm-common/mm-common-simple-properties.h
index db4b3d16..dbfdd858 100644
--- a/libmm-common/mm-common-simple-properties.h
+++ b/libmm-common/mm-common-simple-properties.h
@@ -32,9 +32,10 @@ G_BEGIN_DECLS
 #define MM_COMMON_SIMPLE_PROPERTY_SIGNAL_QUALITY          "signal-quality"
 #define MM_COMMON_SIMPLE_PROPERTY_BANDS                   "bands"
 #define MM_COMMON_SIMPLE_PROPERTY_ACCESS_TECHNOLOGIES     "access-technologies"
-#define MM_COMMON_SIMPLE_PROPERTY_3GPP_REGISTRATION_STATE "registration-state"
-#define MM_COMMON_SIMPLE_PROPERTY_3GPP_OPERATOR_CODE      "operator-code"
-#define MM_COMMON_SIMPLE_PROPERTY_3GPP_OPERATOR_NAME      "operator-name"
+
+#define MM_COMMON_SIMPLE_PROPERTY_3GPP_REGISTRATION_STATE "m3gpp-registration-state"
+#define MM_COMMON_SIMPLE_PROPERTY_3GPP_OPERATOR_CODE      "m3gpp-operator-code"
+#define MM_COMMON_SIMPLE_PROPERTY_3GPP_OPERATOR_NAME      "m3gpp-operator-name"
 
 typedef struct _MMCommonSimpleProperties MMCommonSimpleProperties;
 typedef struct _MMCommonSimplePropertiesClass MMCommonSimplePropertiesClass;
diff --git a/new/org.freedesktop.ModemManager1.Modem.Simple.xml b/new/org.freedesktop.ModemManager1.Modem.Simple.xml
index 34920af8..5e3fe490 100644
--- a/new/org.freedesktop.ModemManager1.Modem.Simple.xml
+++ b/new/org.freedesktop.ModemManager1.Modem.Simple.xml
@@ -146,26 +146,6 @@
               (signature <literal>"u"</literal>).
             </listitem>
           </varlistentry>
-          <varlistentry><term><literal>"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>"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>"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>"bands"</literal></term>
             <listitem>
               List of <link linkend="MMModemBand">MMModemBand</link> values,
@@ -180,6 +160,26 @@
               (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>
         </variablelist>
     -->
     <method name="GetStatus">