diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-01-12 16:42:29 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:14:50 +0100 |
| commit | 71fbd2248c20d583300259648703df2f81139dac (patch) | |
| tree | df48ff3775b7650933833e251a6eb19c8d319200 | |
| parent | 8c704ea7a25c2efc1927d63b42853a4d13b55965 (diff) | |
api,dbus: prefix with 'm3gpp' the 3GPP-specific entries returned in the simple status
Note that we cannot have properties starting with a digit :-/
| -rw-r--r-- | libmm-common/mm-common-simple-properties.h | 7 | ||||
| -rw-r--r-- | new/org.freedesktop.ModemManager1.Modem.Simple.xml | 36 |
2 files changed, 22 insertions, 21 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,40 +146,40 @@ (signature <literal>"u"</literal>). </listitem> </varlistentry> - <varlistentry><term><literal>"registration-state"</literal></term> + <varlistentry><term><literal>"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 + 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> + <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>"operator-name"</literal></term> + <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>"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> </variablelist> --> <method name="GetStatus"> |