colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api,dbus: renamed AccessTechnology' to AccessTechnologies'

Browse Source 
We are reporting a bitmask of flags, not just one value.
This commit is contained in:
Aleksander Morgado
2011-12-20 18:32:02 +01:00
parent ff60251733
commit e2e0812272
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmm-glib/mm-modem.c
View File

@@ -557,11 +557,11 @@ mm_modem_get_state (MMModem *self)
* Returns: A ##MMModemAccessTech value. * Returns: A ##MMModemAccessTech value.
*/ */
MMModemAccessTech MMModemAccessTech
mm_modem_get_access_technology (MMModem *self) mm_modem_get_access_technologies (MMModem *self)
{ {
g_return_val_if_fail (MM_GDBUS_IS_MODEM (self), MM_MODEM_ACCESS_TECH_UNKNOWN); g_return_val_if_fail (MM_GDBUS_IS_MODEM (self), MM_MODEM_ACCESS_TECH_UNKNOWN);
return (MMModemAccessTech) mm_gdbus_modem_get_access_technology (self); return (MMModemAccessTech) mm_gdbus_modem_get_access_technologies (self);
} }
/** /**

2
libmm-glib/mm-modem.h
View File

@@ -64,7 +64,7 @@ gchar *mm_modem_dup_equipment_identifier (MMModem *self);
MMModemLock mm_modem_get_unlock_required (MMModem *self); MMModemLock mm_modem_get_unlock_required (MMModem *self);
guint mm_modem_get_unlock_retries (MMModem *self); guint mm_modem_get_unlock_retries (MMModem *self);
MMModemState mm_modem_get_state (MMModem *self); MMModemState mm_modem_get_state (MMModem *self);
MMModemAccessTech mm_modem_get_access_technology (MMModem *self); MMModemAccessTech mm_modem_get_access_technologies (MMModem *self);
guint mm_modem_get_signal_quality (MMModem *self, guint mm_modem_get_signal_quality (MMModem *self,
gboolean *recent); gboolean *recent);
MMModemMode mm_modem_get_supported_modes (MMModem *self); MMModemMode mm_modem_get_supported_modes (MMModem *self);

10
new/org.freedesktop.ModemManager1.Modem.xml
View File

@@ -324,17 +324,17 @@
<property name="State" type="u" access="read" /> <property name="State" type="u" access="read" />
<!-- <!--
AccessTechnology: AccessTechnologies:
The current network access technology used by the device to communicate Bitmask of <link linkend="MMModemAccessTech">MMModemAccessTech</link> values,
with the network, given as a specifying the current network access technologies used by the device to communicate
<link linkend="MMModemAccessTech">MMModemAccessTech</link> value. with the network.
If the device's access technology cannot be determined, If the device's access technology cannot be determined,
<link linkend="MM-MODEM-ACCESS-TECH-UNKNOWN:CAPS"><constant>MM_MODEM_ACCESS_TECH_UNKNOWN</constant></link> <link linkend="MM-MODEM-ACCESS-TECH-UNKNOWN:CAPS"><constant>MM_MODEM_ACCESS_TECH_UNKNOWN</constant></link>
will be reported. will be reported.
--> -->
<property name="AccessTechnology" type="u" access="read" /> <property name="AccessTechnologies" type="u" access="read" />
<!-- <!--
SignalQuality: SignalQuality:

2
src/mm-iface-modem.c
View File

@@ -2202,7 +2202,7 @@ mm_iface_modem_initialize (MMIfaceModem *self,
mm_gdbus_modem_set_equipment_identifier (skeleton, NULL); mm_gdbus_modem_set_equipment_identifier (skeleton, NULL);
mm_gdbus_modem_set_unlock_required (skeleton, MM_MODEM_LOCK_UNKNOWN); mm_gdbus_modem_set_unlock_required (skeleton, MM_MODEM_LOCK_UNKNOWN);
mm_gdbus_modem_set_unlock_retries (skeleton, 0); mm_gdbus_modem_set_unlock_retries (skeleton, 0);
mm_gdbus_modem_set_access_technology (skeleton, MM_MODEM_ACCESS_TECH_UNKNOWN); mm_gdbus_modem_set_access_technologies (skeleton, MM_MODEM_ACCESS_TECH_UNKNOWN);
mm_gdbus_modem_set_signal_quality (skeleton, g_variant_new ("(ub)", 0, FALSE)); mm_gdbus_modem_set_signal_quality (skeleton, g_variant_new ("(ub)", 0, FALSE));
mm_gdbus_modem_set_supported_modes (skeleton, MM_MODEM_MODE_NONE); mm_gdbus_modem_set_supported_modes (skeleton, MM_MODEM_MODE_NONE);
mm_gdbus_modem_set_allowed_modes (skeleton, MM_MODEM_MODE_ANY); mm_gdbus_modem_set_allowed_modes (skeleton, MM_MODEM_MODE_ANY);