diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-04-04 09:17:08 -0700 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-04-04 09:17:08 -0700 |
| commit | 2f1fbfb52039813283add147f79f287d6dc3f3df (patch) | |
| tree | 5a4a73477dda06eb14ea8f49229a52ca144b3eb6 /src | |
| parent | f39afdd5f7c5d6ed56dd7a00ddb13de12dcda5b8 (diff) | |
core: only enable location API for dbus-glib >= 0.86
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 23 | ||||
| -rw-r--r-- | src/mm-modem-location.c | 10 |
2 files changed, 26 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 29d2635e..fd72239f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,6 +50,10 @@ auth_sources += \ mm-auth-provider-polkit.h endif +loc_sources = \ + mm-modem-location.c \ + mm-modem-location.h + modem_manager_SOURCES = \ main.c \ mm-callback-info.c \ @@ -88,8 +92,6 @@ modem_manager_SOURCES = \ mm-modem-gsm-sms.h \ mm-modem-simple.c \ mm-modem-simple.h \ - mm-modem-location.c \ - mm-modem-location.h \ mm-options.c \ mm-options.h \ mm-plugin.c \ @@ -120,9 +122,6 @@ mm-modem-gsm-network-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-network.xm mm-modem-gsm-sms-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-sms.xml dbus-binding-tool --prefix=mm_modem_gsm_sms --mode=glib-server --output=$@ $< -mm-modem-location-glue.h: $(top_srcdir)/introspection/mm-modem-location.xml - dbus-binding-tool --prefix=mm_modem_location --mode=glib-server --output=$@ $< - BUILT_SOURCES = \ mm-manager-glue.h \ mm-modem-glue.h \ @@ -130,7 +129,17 @@ BUILT_SOURCES = \ mm-modem-cdma-glue.h \ mm-modem-gsm-card-glue.h \ mm-modem-gsm-network-glue.h \ - mm-modem-gsm-sms-glue.h \ - mm-modem-location-glue.h + mm-modem-gsm-sms-glue.h + +if WITH_LOCATION_API +mm-modem-location-glue.h: $(top_srcdir)/introspection/mm-modem-location.xml + dbus-binding-tool --prefix=mm_modem_location --mode=glib-server --output=$@ $< + +modem_manager_SOURCES += $(loc_sources) + +BUILT_SOURCES += mm-modem-location-glue.h +else +EXTRA_DIST = $(loc_sources) +endif CLEANFILES = $(BUILT_SOURCES) diff --git a/src/mm-modem-location.c b/src/mm-modem-location.c index 886d0326..00182950 100644 --- a/src/mm-modem-location.c +++ b/src/mm-modem-location.c @@ -314,6 +314,16 @@ mm_modem_location_get_type (void) g_type_interface_add_prerequisite (loc_type, G_TYPE_OBJECT); dbus_g_object_type_install_info (loc_type, &dbus_glib_mm_modem_location_object_info); + + /* Register some shadow properties to handle Enabled and Capabilities + * since these could be used by other interfaces. + */ + dbus_g_object_type_register_shadow_property (loc_type, + "Enabled", + MM_MODEM_LOCATION_ENABLED); + dbus_g_object_type_register_shadow_property (loc_type, + "Capabilities", + MM_MODEM_LOCATION_CAPABILITIES); } return loc_type; |