From 245818de331608a10c2279a56c5feba86aa1a1ea Mon Sep 17 00:00:00 2001 From: Elly Jones Date: Mon, 20 Dec 2010 12:23:41 -0500 Subject: [PATCH] Install xml files so they can be used by cromo (chromeos modem manager) Amended: Install the files under their proper DBus names. Review URL: http://codereview.chromium.org/1618004 (cherry picked from commit 89f7f05f1294485fa8b44cfdd3c9b0d924d45ac1) Conflicts: Makefile.am Change-Id: I65b2b0c1b5e579bb5b1d5d5b390c3be2ae49543c --- introspection/all.xml | 26 ++--- introspection/mm-modem-cdma.xml | 97 ------------------- ...ml => org.freedesktop.DBus.Properties.xml} | 0 ...eedesktop.ModemManager.Modem.Gsm.Card.xml} | 0 ...sktop.ModemManager.Modem.Gsm.Contacts.xml} | 0 ...reedesktop.ModemManager.Modem.Gsm.Hso.xml} | 0 ...esktop.ModemManager.Modem.Gsm.Network.xml} | 0 ...reedesktop.ModemManager.Modem.Gsm.SMS.xml} | 0 ...eedesktop.ModemManager.Modem.Gsm.Ussd.xml} | 0 ...rg.freedesktop.ModemManager.Modem.Gsm.xml} | 0 ...eedesktop.ModemManager.Modem.Location.xml} | 0 ...freedesktop.ModemManager.Modem.Simple.xml} | 0 ...=> org.freedesktop.ModemManager.Modem.xml} | 0 ...r.xml => org.freedesktop.ModemManager.xml} | 0 plugins/Makefile.am | 2 +- src/Makefile.am | 20 ++-- 16 files changed, 24 insertions(+), 121 deletions(-) delete mode 100644 introspection/mm-modem-cdma.xml rename introspection/{mm-properties-changed.xml => org.freedesktop.DBus.Properties.xml} (100%) rename introspection/{mm-modem-gsm-card.xml => org.freedesktop.ModemManager.Modem.Gsm.Card.xml} (100%) rename introspection/{mm-modem-gsm-contacts.xml => org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml} (100%) rename introspection/{mm-modem-gsm-hso.xml => org.freedesktop.ModemManager.Modem.Gsm.Hso.xml} (100%) rename introspection/{mm-modem-gsm-network.xml => org.freedesktop.ModemManager.Modem.Gsm.Network.xml} (100%) rename introspection/{mm-modem-gsm-sms.xml => org.freedesktop.ModemManager.Modem.Gsm.SMS.xml} (100%) rename introspection/{mm-modem-gsm-ussd.xml => org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml} (100%) rename introspection/{mm-modem-gsm.xml => org.freedesktop.ModemManager.Modem.Gsm.xml} (100%) rename introspection/{mm-modem-location.xml => org.freedesktop.ModemManager.Modem.Location.xml} (100%) rename introspection/{mm-modem-simple.xml => org.freedesktop.ModemManager.Modem.Simple.xml} (100%) rename introspection/{mm-modem.xml => org.freedesktop.ModemManager.Modem.xml} (100%) rename introspection/{mm-manager.xml => org.freedesktop.ModemManager.xml} (100%) diff --git a/introspection/all.xml b/introspection/all.xml index dd30b574..0533e14c 100644 --- a/introspection/all.xml +++ b/introspection/all.xml @@ -23,19 +23,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/introspection/mm-modem-cdma.xml b/introspection/mm-modem-cdma.xml deleted file mode 100644 index bf91c0c9..00000000 --- a/introspection/mm-modem-cdma.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - Get the current signal quality. - - - - - - Signal quality (percent). - - - - - - - Get the Electronic Serial Number of the card. - - - - - - The ESN. - - - - - - - Get the Service System details of the current network, if registered. - - - - - - A structure containing the Band Class (0 = unknown, 1 = 800 MHz, 2 = 1900 MHz), the Band ("A" - "F" as defined by IS707-A), and the System ID of the serving network. - - - - - - - The signal quality changed. - - - - The new quality in percent, 0..100. - - - - - - Get device registration state. - - - - CDMA 1x registration state. - - - EVDO registration state. - - - - - - The device registration state changed. - - - CDMA 1x registration state. - - - EVDO registration state. - - - - - - Registration status is unknown or the device is not registered. - - - Registered, but roaming status is unknown or cannot be provided by the device. The device may or may not be roaming. - - - Currently registered on the home network. - - - Currently registered on a roaming network. - - - - - - diff --git a/introspection/mm-properties-changed.xml b/introspection/org.freedesktop.DBus.Properties.xml similarity index 100% rename from introspection/mm-properties-changed.xml rename to introspection/org.freedesktop.DBus.Properties.xml diff --git a/introspection/mm-modem-gsm-card.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Card.xml similarity index 100% rename from introspection/mm-modem-gsm-card.xml rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.Card.xml diff --git a/introspection/mm-modem-gsm-contacts.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml similarity index 100% rename from introspection/mm-modem-gsm-contacts.xml rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml diff --git a/introspection/mm-modem-gsm-hso.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml similarity index 100% rename from introspection/mm-modem-gsm-hso.xml rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml diff --git a/introspection/mm-modem-gsm-network.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml similarity index 100% rename from introspection/mm-modem-gsm-network.xml rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml diff --git a/introspection/mm-modem-gsm-sms.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml similarity index 100% rename from introspection/mm-modem-gsm-sms.xml rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml diff --git a/introspection/mm-modem-gsm-ussd.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml similarity index 100% rename from introspection/mm-modem-gsm-ussd.xml rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml diff --git a/introspection/mm-modem-gsm.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.xml similarity index 100% rename from introspection/mm-modem-gsm.xml rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.xml diff --git a/introspection/mm-modem-location.xml b/introspection/org.freedesktop.ModemManager.Modem.Location.xml similarity index 100% rename from introspection/mm-modem-location.xml rename to introspection/org.freedesktop.ModemManager.Modem.Location.xml diff --git a/introspection/mm-modem-simple.xml b/introspection/org.freedesktop.ModemManager.Modem.Simple.xml similarity index 100% rename from introspection/mm-modem-simple.xml rename to introspection/org.freedesktop.ModemManager.Modem.Simple.xml diff --git a/introspection/mm-modem.xml b/introspection/org.freedesktop.ModemManager.Modem.xml similarity index 100% rename from introspection/mm-modem.xml rename to introspection/org.freedesktop.ModemManager.Modem.xml diff --git a/introspection/mm-manager.xml b/introspection/org.freedesktop.ModemManager.xml similarity index 100% rename from introspection/mm-manager.xml rename to introspection/org.freedesktop.ModemManager.xml diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 61a29c6c..9f85d54f 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -97,7 +97,7 @@ libmm_plugin_hso_la_SOURCES = \ mm-modem-hso.c \ mm-modem-hso.h -mm-modem-gsm-hso-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-hso.xml +mm-modem-gsm-hso-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml $(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_gsm_hso --mode=glib-server --output=$@ $< libmm_plugin_hso_la_CPPFLAGS = \ diff --git a/src/Makefile.am b/src/Makefile.am index 924ca261..3e656d81 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -120,31 +120,31 @@ modem_manager_SOURCES = \ mm-modem-location.c \ mm-modem-location.h -mm-manager-glue.h: $(top_srcdir)/introspection/mm-manager.xml +mm-manager-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.xml $(AM_V_GEN) dbus-binding-tool --prefix=mm_manager --mode=glib-server --output=$@ $< -mm-modem-glue.h: $(top_srcdir)/introspection/mm-modem.xml +mm-modem-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.xml $(AM_V_GEN) dbus-binding-tool --prefix=mm_modem --mode=glib-server --output=$@ $< -mm-modem-simple-glue.h: $(top_srcdir)/introspection/mm-modem-simple.xml +mm-modem-simple-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Simple.xml $(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_simple --mode=glib-server --output=$@ $< -mm-modem-cdma-glue.h: $(top_srcdir)/introspection/mm-modem-cdma.xml +mm-modem-cdma-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Cdma.xml $(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_cdma --mode=glib-server --output=$@ $< -mm-modem-gsm-card-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-card.xml +mm-modem-gsm-card-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Gsm.Card.xml $(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_gsm_card --mode=glib-server --output=$@ $< -mm-modem-gsm-network-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-network.xml +mm-modem-gsm-network-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml $(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_gsm_network --mode=glib-server --output=$@ $< -mm-modem-gsm-sms-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-sms.xml +mm-modem-gsm-sms-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml $(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_gsm_sms --mode=glib-server --output=$@ $< -mm-modem-gsm-ussd-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-ussd.xml +mm-modem-gsm-ussd-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml $(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_gsm_ussd --mode=glib-server --output=$@ $< -mm-properties-changed-glue.h: $(top_srcdir)/introspection/mm-properties-changed.xml +mm-properties-changed-glue.h: $(top_srcdir)/introspection/org.freedesktop.DBus.Properties.xml $(AM_V_GEN) dbus-binding-tool --prefix=mm_properties_changed --mode=glib-server --output=$@ $< BUILT_SOURCES = \ @@ -158,7 +158,7 @@ BUILT_SOURCES = \ mm-modem-gsm-ussd-glue.h \ mm-properties-changed-glue.h -mm-modem-location-glue.h: $(top_srcdir)/introspection/mm-modem-location.xml +mm-modem-location-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Location.xml $(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_location --mode=glib-server --output=$@ $< modem_manager_SOURCES += $(loc_sources)