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

api: rename 3GPP and CDMA interface paths

Browse Source 
Elements in a DBus interface name cannot start with a digit, so
"org.freedesktop.ModemManager1.Modem.3gpp" is an invalid interface name.

Renamed here all relevant interfaces so that they have an additional "Modem"
prefix in the element, so we get now:
 "org.freedesktop.ModemManager1.Modem.Modem3gpp"
 "org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd"
 "org.freedesktop.ModemManager1.Modem.ModemCdma"

Objects generated with gdbus-codegen maintain the previous names.
This commit is contained in:
Aleksander Morgado
2011-11-28 17:37:02 +01:00
parent 27494eae51
commit a58f95121a
7 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/reference/api/Makefile.am
View File

@@ -54,9 +54,9 @@ expand_content_files = \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \ $(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \ $(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \ $(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Cdma.xml \ $(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.xml \ $(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml \ $(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml \ $(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml \
$(NULL) $(NULL)

6
docs/reference/api/mm-docs.xml
View File

@@ -110,12 +110,12 @@
</section> </section>
<section> <section>
<title>3GPP specific</title> <title>3GPP specific</title>
<xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.xml"/> <xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml"/>
<xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml"/> <xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml"/>
</section> </section>
<section> <section>
<title>CDMA specific</title> <title>CDMA specific</title>
<xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Cdma.xml"/> <xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/>
</section> </section>
<section> <section>
<title>Other</title> <title>Other</title>

15
libmm-common/Makefile.am
View File

@@ -29,9 +29,9 @@ GENERATED_DOC = \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \ mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \ mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \ mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Cdma.xml \ mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.xml \ mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml \ mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml
# Enum types # Enum types
@@ -95,9 +95,9 @@ mm_gdbus_modem_deps = \
$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Location.xml \ $(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Location.xml \
$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Firmware.xml \ $(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Firmware.xml \
$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Contacts.xml \ $(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Contacts.xml \
$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Cdma.xml \ $(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.3gpp.xml \ $(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml \ $(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Simple.xml $(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Simple.xml
$(mm_gdbus_modem_generated): $(mm_gdbus_modem_deps) $(mm_gdbus_modem_generated): $(mm_gdbus_modem_deps)
$(AM_V_GEN) gdbus-codegen \ $(AM_V_GEN) gdbus-codegen \
@@ -106,6 +106,9 @@ $(mm_gdbus_modem_generated): $(mm_gdbus_modem_deps)
--generate-docbook mm-gdbus-doc \ --generate-docbook mm-gdbus-doc \
--generate-c-code mm-gdbus-modem \ --generate-c-code mm-gdbus-modem \
--c-generate-object-manager \ --c-generate-object-manager \
--annotate "org.freedesktop.ModemManager1.Modem.ModemCdma" org.gtk.GDBus.C.Name ModemCdma \
--annotate "org.freedesktop.ModemManager1.Modem.Modem3gpp" org.gtk.GDBus.C.Name Modem3gpp \
--annotate "org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd" org.gtk.GDBus.C.Name Modem3gppUssd \
$^ \ $^ \
$(NULL) $(NULL)

6
new/all.xml
View File

@@ -7,9 +7,9 @@
<xi:include href="org.freedesktop.ModemManager1.Bearer.xml"/> <xi:include href="org.freedesktop.ModemManager1.Bearer.xml"/>
<xi:include href="org.freedesktop.ModemManager1.Sms.xml"/> <xi:include href="org.freedesktop.ModemManager1.Sms.xml"/>
<xi:include href="org.freedesktop.ModemManager1.Modem.xml"/> <xi:include href="org.freedesktop.ModemManager1.Modem.xml"/>
<xi:include href="org.freedesktop.ModemManager1.Modem.3gpp.xml"/> <xi:include href="org.freedesktop.ModemManager1.Modem.Modem3gpp.xml"/>
<xi:include href="org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml"/> <xi:include href="org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml"/>
<xi:include href="org.freedesktop.ModemManager1.Modem.Cdma.xml"/> <xi:include href="org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/>
<xi:include href="org.freedesktop.ModemManager1.Modem.Messaging.xml"/> <xi:include href="org.freedesktop.ModemManager1.Modem.Messaging.xml"/>
<xi:include href="org.freedesktop.ModemManager1.Modem.Location.xml"/> <xi:include href="org.freedesktop.ModemManager1.Modem.Location.xml"/>
<xi:include href="org.freedesktop.ModemManager1.Modem.Firmware.xml"/> <xi:include href="org.freedesktop.ModemManager1.Modem.Firmware.xml"/>

8
new/org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml → new/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml
View File

@@ -12,12 +12,12 @@
<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"> <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
<!-- <!--
org.freedesktop.ModemManager1.Modem.3gpp.Ussd: org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd:
@short_description: The ModemManager 3GPP USSD interface. @short_description: The ModemManager 3GPP USSD interface.
This interface provides access to actions based on the USSD protocol. This interface provides access to actions based on the USSD protocol.
--> -->
<interface name="org.freedesktop.ModemManager1.Modem.3gpp.Ussd"> <interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd">
<!-- <!--
Initiate: Initiate:
@@ -43,7 +43,7 @@
Respond to a USSD request that is either initiated by the mobile network, Respond to a USSD request that is either initiated by the mobile network,
or that is awaiting further input after or that is awaiting further input after
<link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-3gpp-Ussd.Initiate">Initiate()</link> <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-Modem3gpp-Ussd.Initiate">Initiate()</link>
was called. was called.
--> -->
<method name="Respond"> <method name="Respond">
@@ -82,7 +82,7 @@
Contains any pending network-initiated request for a response. Client Contains any pending network-initiated request for a response. Client
should call should call
<link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-3gpp-Ussd.Respond">Respond()</link> <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-Modem3gpp-Ussd.Respond">Respond()</link>
with the appropriate response to this request. with the appropriate response to this request.
When no USSD session is active, or when there is no pending When no USSD session is active, or when there is no pending

5
new/org.freedesktop.ModemManager1.Modem.3gpp.xml → new/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml
View File

@@ -12,13 +12,13 @@
<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"> <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
<!-- <!--
org.freedesktop.ModemManager1.Modem.3gpp: org.freedesktop.ModemManager1.Modem.Modem3gpp:
@short_description: The ModemManager 3GPP interface. @short_description: The ModemManager 3GPP interface.
This interface provides access to specific actions that may be performed This interface provides access to specific actions that may be performed
in modems with 3GPP capabilities. in modems with 3GPP capabilities.
--> -->
<interface name="org.freedesktop.ModemManager1.Modem.3gpp"> <interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp">
<!-- <!--
Register: Register:
@@ -140,4 +140,3 @@
</interface> </interface>
</node> </node>

4
new/org.freedesktop.ModemManager1.Modem.Cdma.xml → new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
View File

@@ -12,13 +12,13 @@
<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"> <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
<!-- <!--
org.freedesktop.ModemManager1.Modem.Cdma: org.freedesktop.ModemManager1.Modem.ModemCdma:
@short_description: The ModemManager CDMA interface. @short_description: The ModemManager CDMA interface.
This interface provides access to specific actions that may be performed This interface provides access to specific actions that may be performed
in modems with CDMA capabilities. in modems with CDMA capabilities.
--> -->
<interface name="org.freedesktop.ModemManager1.Modem.Cdma"> <interface name="org.freedesktop.ModemManager1.Modem.ModemCdma">
<!-- <!--
Activate: Activate: