diff --git a/docs/reference/api/Makefile.am b/docs/reference/api/Makefile.am index 3b02ad23..33c28e21 100644 --- a/docs/reference/api/Makefile.am +++ b/docs/reference/api/Makefile.am @@ -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 \ diff --git a/docs/reference/api/ModemManager-dbus-reference.xml b/docs/reference/api/ModemManager-dbus-reference.xml index 64049062..f6f7d32d 100644 --- a/docs/reference/api/ModemManager-dbus-reference.xml +++ b/docs/reference/api/ModemManager-dbus-reference.xml @@ -136,7 +136,7 @@ - + diff --git a/docs/reference/libmm-glib/libmm-glib-docs.xml b/docs/reference/libmm-glib/libmm-glib-docs.xml index c9f498ca..4e0e1fd8 100644 --- a/docs/reference/libmm-glib/libmm-glib-docs.xml +++ b/docs/reference/libmm-glib/libmm-glib-docs.xml @@ -174,9 +174,9 @@ - + diff --git a/docs/reference/libmm-glib/libmm-glib-sections.txt b/docs/reference/libmm-glib/libmm-glib-sections.txt index 2af58403..60c2137e 100644 --- a/docs/reference/libmm-glib/libmm-glib-sections.txt +++ b/docs/reference/libmm-glib/libmm-glib-sections.txt @@ -1962,91 +1962,6 @@ MmGdbusModemFirmwareSkeletonPrivate mm_gdbus_modem_firmware_skeleton_get_type - -
-MmGdbusModemContacts -MmGdbusModemContacts -MmGdbusModemContacts -MmGdbusModemContactsIface - -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 - -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 - -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 -
- -
-MmGdbusModemContactsProxy -MmGdbusModemContactsProxy -MmGdbusModemContactsProxy - -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 - -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 -
- -
-MmGdbusModemContactsSkeleton -MmGdbusModemContactsSkeleton -MmGdbusModemContactsSkeleton - -mm_gdbus_modem_contacts_skeleton_new - -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 -
-
MmGdbusModemSimple MmGdbusModemSimple @@ -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 @@ -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 diff --git a/docs/reference/libmm-glib/libmm-glib.types b/docs/reference/libmm-glib/libmm-glib.types index bb78f909..566976cb 100644 --- a/docs/reference/libmm-glib/libmm-glib.types +++ b/docs/reference/libmm-glib/libmm-glib.types @@ -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 diff --git a/introspection/Makefile.am b/introspection/Makefile.am index f29f8dc9..cf91caff 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -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) diff --git a/introspection/all.xml b/introspection/all.xml index 1df239e3..24acf595 100644 --- a/introspection/all.xml +++ b/introspection/all.xml @@ -14,6 +14,7 @@ - + + diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Contacts.xml b/introspection/wip-org.freedesktop.ModemManager1.Modem.Contacts.xml similarity index 100% rename from introspection/org.freedesktop.ModemManager1.Modem.Contacts.xml rename to introspection/wip-org.freedesktop.ModemManager1.Modem.Contacts.xml diff --git a/libmm-glib/generated/Makefile.am b/libmm-glib/generated/Makefile.am index c0429b18..b54b234d 100644 --- a/libmm-glib/generated/Makefile.am +++ b/libmm-glib/generated/Makefile.am @@ -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 \ diff --git a/libmm-glib/mm-manager.c b/libmm-glib/mm-manager.c index efea9b0c..81c6e4f8 100644 --- a/libmm-glib/mm-manager.c +++ b/libmm-glib/mm-manager.c @@ -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); }