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

api,introspection: avoid exposing the Contacts interface

Browse Source 
There is no implementation of the Contacts interface yet, just avoid exposing it
for now.

https://bugzilla.gnome.org/show_bug.cgi?id=701989
This commit is contained in:
Aleksander Morgado
2013-06-11 10:11:39 +02:00
parent ce84ea510f
commit b582ba58e8
10 changed files with 7 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,6 @@ expand_content_files = \
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml \
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \

2
docs/reference/api/ModemManager-dbus-reference.xml
View File

@@ -136,7 +136,7 @@
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml"/>
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml"/>
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml"/>
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml"/>
<!--xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml"/-->
</chapter>
<chapter id="ref-dbus-object-bearer">

4
docs/reference/libmm-glib/libmm-glib-docs.xml
View File

@@ -174,9 +174,9 @@
<xi:include href="xml/MmGdbusModemFirmwareProxy.xml"/>
<xi:include href="xml/MmGdbusModemFirmwareSkeleton.xml"/>
<xi:include href="xml/MmGdbusModemContacts.xml"/>
<!--xi:include href="xml/MmGdbusModemContacts.xml"/>
<xi:include href="xml/MmGdbusModemContactsProxy.xml"/>
<xi:include href="xml/MmGdbusModemContactsSkeleton.xml"/>
<xi:include href="xml/MmGdbusModemContactsSkeleton.xml"/-->
<xi:include href="xml/MmGdbusModemSimple.xml"/>
<xi:include href="xml/MmGdbusModemSimpleProxy.xml"/>

88
docs/reference/libmm-glib/libmm-glib-sections.txt
View File

@@ -1962,91 +1962,6 @@ MmGdbusModemFirmwareSkeletonPrivate
mm_gdbus_modem_firmware_skeleton_get_type
</SECTION>
<SECTION>
<FILE>MmGdbusModemContacts</FILE>
<TITLE>MmGdbusModemContacts</TITLE>
MmGdbusModemContacts
MmGdbusModemContactsIface
<SUBSECTION Methods>
mm_gdbus_modem_contacts_call_add
mm_gdbus_modem_contacts_call_add_finish
mm_gdbus_modem_contacts_call_add_sync
mm_gdbus_modem_contacts_call_delete
mm_gdbus_modem_contacts_call_delete_finish
mm_gdbus_modem_contacts_call_delete_sync
mm_gdbus_modem_contacts_call_find
mm_gdbus_modem_contacts_call_find_finish
mm_gdbus_modem_contacts_call_find_sync
mm_gdbus_modem_contacts_call_get
mm_gdbus_modem_contacts_call_get_finish
mm_gdbus_modem_contacts_call_get_sync
mm_gdbus_modem_contacts_call_get_count
mm_gdbus_modem_contacts_call_get_count_finish
mm_gdbus_modem_contacts_call_get_count_sync
mm_gdbus_modem_contacts_call_list
mm_gdbus_modem_contacts_call_list_finish
mm_gdbus_modem_contacts_call_list_sync
<SUBSECTION Private>
mm_gdbus_modem_contacts_complete_add
mm_gdbus_modem_contacts_complete_delete
mm_gdbus_modem_contacts_complete_find
mm_gdbus_modem_contacts_complete_get
mm_gdbus_modem_contacts_complete_get_count
mm_gdbus_modem_contacts_complete_list
mm_gdbus_modem_contacts_emit_added
mm_gdbus_modem_contacts_emit_deleted
mm_gdbus_modem_contacts_interface_info
mm_gdbus_modem_contacts_override_properties
<SUBSECTION Standard>
MM_GDBUS_IS_MODEM_CONTACTS
MM_GDBUS_MODEM_CONTACTS
MM_GDBUS_MODEM_CONTACTS_GET_IFACE
MM_GDBUS_TYPE_MODEM_CONTACTS
mm_gdbus_modem_contacts_get_type
</SECTION>
<SECTION>
<FILE>MmGdbusModemContactsProxy</FILE>
<TITLE>MmGdbusModemContactsProxy</TITLE>
MmGdbusModemContactsProxy
<SUBSECTION New>
mm_gdbus_modem_contacts_proxy_new
mm_gdbus_modem_contacts_proxy_new_finish
mm_gdbus_modem_contacts_proxy_new_for_bus
mm_gdbus_modem_contacts_proxy_new_for_bus_finish
mm_gdbus_modem_contacts_proxy_new_for_bus_sync
mm_gdbus_modem_contacts_proxy_new_sync
<SUBSECTION Standard>
MmGdbusModemContactsProxyClass
MM_GDBUS_IS_MODEM_CONTACTS_PROXY
MM_GDBUS_IS_MODEM_CONTACTS_PROXY_CLASS
MM_GDBUS_MODEM_CONTACTS_PROXY
MM_GDBUS_MODEM_CONTACTS_PROXY_CLASS
MM_GDBUS_MODEM_CONTACTS_PROXY_GET_CLASS
MM_GDBUS_TYPE_MODEM_CONTACTS_PROXY
MmGdbusModemContactsProxyPrivate
mm_gdbus_modem_contacts_proxy_get_type
</SECTION>
<SECTION>
<FILE>MmGdbusModemContactsSkeleton</FILE>
<TITLE>MmGdbusModemContactsSkeleton</TITLE>
MmGdbusModemContactsSkeleton
<SUBSECTION New>
mm_gdbus_modem_contacts_skeleton_new
<SUBSECTION Standard>
MmGdbusModemContactsSkeletonClass
MM_GDBUS_IS_MODEM_CONTACTS_SKELETON
MM_GDBUS_IS_MODEM_CONTACTS_SKELETON_CLASS
MM_GDBUS_MODEM_CONTACTS_SKELETON
MM_GDBUS_MODEM_CONTACTS_SKELETON_CLASS
MM_GDBUS_MODEM_CONTACTS_SKELETON_GET_CLASS
MM_GDBUS_TYPE_MODEM_CONTACTS_SKELETON
MmGdbusModemContactsSkeletonPrivate
mm_gdbus_modem_contacts_skeleton_get_type
</SECTION>
<SECTION>
<FILE>MmGdbusModemSimple</FILE>
<TITLE>MmGdbusModemSimple</TITLE>
@@ -2140,8 +2055,6 @@ mm_gdbus_object_peek_modem_time
mm_gdbus_object_get_modem_time
mm_gdbus_object_peek_modem_firmware
mm_gdbus_object_get_modem_firmware
mm_gdbus_object_peek_modem_contacts
mm_gdbus_object_get_modem_contacts
mm_gdbus_object_peek_modem_simple
mm_gdbus_object_get_modem_simple
<SUBSECTION Methods>
@@ -2183,7 +2096,6 @@ mm_gdbus_object_skeleton_set_modem
mm_gdbus_object_skeleton_set_modem3gpp
mm_gdbus_object_skeleton_set_modem3gpp_ussd
mm_gdbus_object_skeleton_set_modem_cdma
mm_gdbus_object_skeleton_set_modem_contacts
mm_gdbus_object_skeleton_set_modem_firmware
mm_gdbus_object_skeleton_set_modem_location
mm_gdbus_object_skeleton_set_modem_messaging

3
docs/reference/libmm-glib/libmm-glib.types
View File

@@ -20,9 +20,6 @@ mm_gdbus_modem3gpp_ussd_skeleton_get_type
mm_gdbus_modem_cdma_get_type
mm_gdbus_modem_cdma_proxy_get_type
mm_gdbus_modem_cdma_skeleton_get_type
mm_gdbus_modem_contacts_get_type
mm_gdbus_modem_contacts_proxy_get_type
mm_gdbus_modem_contacts_skeleton_get_type
mm_gdbus_modem_firmware_get_type
mm_gdbus_modem_firmware_proxy_get_type
mm_gdbus_modem_firmware_skeleton_get_type

2
introspection/Makefile.am
View File

@@ -1,6 +1,6 @@
# DBus Introspection files
XMLS = $(wildcard *.xml)
xmldir = $(datadir)/dbus-1/interfaces
xml_DATA = $(filter-out all.xml, $(XMLS))
xml_DATA = $(filter-out all.xml wip-*, $(XMLS))
EXTRA_DIST = $(XMLS)

3
introspection/all.xml
View File

@@ -14,6 +14,7 @@
<xi:include href="org.freedesktop.ModemManager1.Modem.Location.xml"/>
<xi:include href="org.freedesktop.ModemManager1.Modem.Time.xml"/>
<xi:include href="org.freedesktop.ModemManager1.Modem.Firmware.xml"/>
<xi:include href="org.freedesktop.ModemManager1.Modem.Contacts.xml"/>
<!--xi:include href="wip-org.freedesktop.ModemManager1.Modem.Contacts.xml"/-->
</tp:spec>

0
introspection/org.freedesktop.ModemManager1.Modem.Contacts.xml → introspection/wip-org.freedesktop.ModemManager1.Modem.Contacts.xml
View File

3
libmm-glib/generated/Makefile.am
View File

@@ -30,7 +30,6 @@ GENERATED_DOC = \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.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.ModemCdma.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
@@ -95,7 +94,6 @@ mm_gdbus_modem_generated = \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.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.ModemCdma.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
@@ -106,7 +104,6 @@ mm_gdbus_modem_deps = \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Location.xml \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Time.xml \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Firmware.xml \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Contacts.xml \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \

2
libmm-glib/mm-manager.c
View File

@@ -71,11 +71,11 @@ get_proxy_type (GDBusObjectManagerClient *manager,
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Location", GSIZE_TO_POINTER (MM_TYPE_MODEM_LOCATION));
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Time", GSIZE_TO_POINTER (MM_TYPE_MODEM_TIME));
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Firmware", GSIZE_TO_POINTER (MM_TYPE_MODEM_FIRMWARE));
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Contacts", GSIZE_TO_POINTER (MM_GDBUS_TYPE_MODEM_CONTACTS_PROXY));
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.ModemCdma", GSIZE_TO_POINTER (MM_TYPE_MODEM_CDMA));
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Modem3gpp", GSIZE_TO_POINTER (MM_TYPE_MODEM_3GPP));
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd", GSIZE_TO_POINTER (MM_TYPE_MODEM_3GPP_USSD));
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Simple", GSIZE_TO_POINTER (MM_TYPE_MODEM_SIMPLE));
/* g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Contacts", GSIZE_TO_POINTER (MM_GDBUS_TYPE_MODEM_CONTACTS_PROXY)); */
g_once_init_leave (&once_init_value, 1);
}