From e2e0812272828a1f374233522972f19ca247a2e2 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Tue, 20 Dec 2011 18:32:02 +0100
Subject: [PATCH] api,dbus: renamed `AccessTechnology' to `AccessTechnologies'

We are reporting a bitmask of flags, not just one value.
---
 libmm-glib/mm-modem.c                       |  4 ++--
 libmm-glib/mm-modem.h                       |  2 +-
 new/org.freedesktop.ModemManager1.Modem.xml | 10 +++++-----
 src/mm-iface-modem.c                        |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libmm-glib/mm-modem.c b/libmm-glib/mm-modem.c
index c5d36b50..66d32405 100644
--- a/libmm-glib/mm-modem.c
+++ b/libmm-glib/mm-modem.c
@@ -557,11 +557,11 @@ mm_modem_get_state (MMModem *self)
  * Returns: A ##MMModemAccessTech value.
  */
 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);
 
-    return (MMModemAccessTech) mm_gdbus_modem_get_access_technology (self);
+    return (MMModemAccessTech) mm_gdbus_modem_get_access_technologies (self);
 }
 
 /**
diff --git a/libmm-glib/mm-modem.h b/libmm-glib/mm-modem.h
index 7b4a9384..5c32cf2a 100644
--- a/libmm-glib/mm-modem.h
+++ b/libmm-glib/mm-modem.h
@@ -64,7 +64,7 @@ gchar             *mm_modem_dup_equipment_identifier (MMModem *self);
 MMModemLock        mm_modem_get_unlock_required      (MMModem *self);
 guint              mm_modem_get_unlock_retries       (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,
                                                       gboolean *recent);
 MMModemMode        mm_modem_get_supported_modes      (MMModem *self);
diff --git a/new/org.freedesktop.ModemManager1.Modem.xml b/new/org.freedesktop.ModemManager1.Modem.xml
index 39eca8ad..0f3dc935 100644
--- a/new/org.freedesktop.ModemManager1.Modem.xml
+++ b/new/org.freedesktop.ModemManager1.Modem.xml
@@ -324,17 +324,17 @@
     <property name="State" type="u" access="read" />
 
     <!--
-        AccessTechnology:
+        AccessTechnologies:
 
-        The current network access technology used by the device to communicate
-        with the network, given as a
-        <link linkend="MMModemAccessTech">MMModemAccessTech</link> value.
+        Bitmask of <link linkend="MMModemAccessTech">MMModemAccessTech</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-TECH-UNKNOWN:CAPS"><constant>MM_MODEM_ACCESS_TECH_UNKNOWN</constant></link>
         will be reported.
     -->
-    <property name="AccessTechnology" type="u" access="read" />
+    <property name="AccessTechnologies" type="u" access="read" />
 
     <!--
         SignalQuality:
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c
index 0c93370b..31d74b34 100644
--- a/src/mm-iface-modem.c
+++ b/src/mm-iface-modem.c
@@ -2202,7 +2202,7 @@ mm_iface_modem_initialize (MMIfaceModem *self,
         mm_gdbus_modem_set_equipment_identifier (skeleton, NULL);
         mm_gdbus_modem_set_unlock_required (skeleton, MM_MODEM_LOCK_UNKNOWN);
         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_supported_modes (skeleton, MM_MODEM_MODE_NONE);
         mm_gdbus_modem_set_allowed_modes (skeleton, MM_MODEM_MODE_ANY);