diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-03 12:46:37 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-04 10:17:12 +0200 |
| commit | c250fa3797b40f70cbac1d9e417b1d3ad946ee89 (patch) | |
| tree | 2bceffbeefddda40fc6a5c0f64e9e5b9eeb4a028 /docs | |
| parent | 8bdcdeecb68036bb6be39c5896342f1f1905b606 (diff) | |
libmm-glib: remove the `libmm-common.h' header
Both the ModemManager daemon and the mmcli will now include `libmm-glib.h' only.
We also handle two new special `_LIBMM_INSIDE_MM' and `LIBMM_INSIDE_MMCLI'
symbols, which if included before the `libmm-glib.h' library allow us to:
* Don't include the libmm-glib high level API in the ModemManager daemon, as
the object names would clash with those in the core.
* Define some of the methods of helper objects to be included only if compiling
ModemManager daemon or the mmcli.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/libmm-glib/libmm-glib-docs.xml | 54 |
1 files changed, 38 insertions, 16 deletions
diff --git a/docs/reference/libmm-glib/libmm-glib-docs.xml b/docs/reference/libmm-glib/libmm-glib-docs.xml index 94ecde9f..91e02d85 100644 --- a/docs/reference/libmm-glib/libmm-glib-docs.xml +++ b/docs/reference/libmm-glib/libmm-glib-docs.xml @@ -49,13 +49,6 @@ </bookinfo> <part> - <title>Helper types</title> - <xi:include href="xml/mm-firmware-properties.xml"/> - <xi:include href="xml/mm-bearer-properties.xml"/> - <xi:include href="xml/mm-bearer-ip-config.xml"/> - </part> - - <part> <title>High level API</title> <chapter> @@ -66,20 +59,48 @@ <chapter> <title>The Modem object</title> <xi:include href="xml/mm-object.xml"/> - <xi:include href="xml/mm-modem.xml"/> - <xi:include href="xml/mm-modem-3gpp.xml"/> - <xi:include href="xml/mm-modem-3gpp-ussd.xml"/> - <xi:include href="xml/mm-modem-cdma.xml"/> - <xi:include href="xml/mm-modem-location.xml"/> - <xi:include href="xml/mm-modem-messaging.xml"/> - <xi:include href="xml/mm-modem-time.xml"/> - <xi:include href="xml/mm-modem-firmware.xml"/> - <xi:include href="xml/mm-modem-simple.xml"/> + <section> + <title>Generic interfaces</title> + <xi:include href="xml/mm-modem.xml"/> + <xi:include href="xml/mm-modem-3gpp.xml"/> + <xi:include href="xml/mm-modem-3gpp-ussd.xml"/> + <xi:include href="xml/mm-modem-cdma.xml"/> + <xi:include href="xml/mm-unlock-retries.xml"/> + </section> + <section> + <title>Simple interface support</title> + <xi:include href="xml/mm-modem-simple.xml"/> + <xi:include href="xml/mm-simple-connect-properties.xml"/> + <xi:include href="xml/mm-simple-status.xml"/> + </section> + <section> + <title>Location support</title> + <xi:include href="xml/mm-modem-location.xml"/> + <xi:include href="xml/mm-location-3gpp.xml"/> + <xi:include href="xml/mm-location-gps-nmea.xml"/> + <xi:include href="xml/mm-location-gps-raw.xml"/> + </section> + <section> + <title>Messaging support</title> + <xi:include href="xml/mm-modem-messaging.xml"/> + </section> + <section> + <title>Time support</title> + <xi:include href="xml/mm-modem-time.xml"/> + <xi:include href="xml/mm-network-timezone.xml"/> + </section> + <section> + <title>Firmware support</title> + <xi:include href="xml/mm-modem-firmware.xml"/> + <xi:include href="xml/mm-firmware-properties.xml"/> + </section> </chapter> <chapter> <title>The Bearer object</title> <xi:include href="xml/mm-bearer.xml"/> + <xi:include href="xml/mm-bearer-properties.xml"/> + <xi:include href="xml/mm-bearer-ip-config.xml"/> </chapter> <chapter> @@ -90,6 +111,7 @@ <chapter> <title>The SMS object</title> <xi:include href="xml/mm-sms.xml"/> + <xi:include href="xml/mm-sms-properties.xml"/> </chapter> </part> |