iface-modem-location: don't try to update anything if no skeleton available

This commit is contained in:
Aleksander Morgado
2012-08-28 17:21:08 +02:00
parent 3ff03c946f
commit 26e95b2d3c

View File

@@ -218,6 +218,8 @@ mm_iface_modem_location_gps_update (MMIfaceModemLocation *self,
g_object_get (self, g_object_get (self,
MM_IFACE_MODEM_LOCATION_DBUS_SKELETON, &skeleton, MM_IFACE_MODEM_LOCATION_DBUS_SKELETON, &skeleton,
NULL); NULL);
if (!skeleton)
return;
if (mm_gdbus_modem_location_get_enabled (skeleton) & MM_MODEM_LOCATION_SOURCE_GPS_NMEA) { if (mm_gdbus_modem_location_get_enabled (skeleton) & MM_MODEM_LOCATION_SOURCE_GPS_NMEA) {
g_assert (ctx->location_gps_nmea != NULL); g_assert (ctx->location_gps_nmea != NULL);
@@ -286,6 +288,8 @@ mm_iface_modem_location_3gpp_update_mcc_mnc (MMIfaceModemLocation *self,
g_object_get (self, g_object_get (self,
MM_IFACE_MODEM_LOCATION_DBUS_SKELETON, &skeleton, MM_IFACE_MODEM_LOCATION_DBUS_SKELETON, &skeleton,
NULL); NULL);
if (!skeleton)
return;
if (mm_gdbus_modem_location_get_enabled (skeleton) & MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI) { if (mm_gdbus_modem_location_get_enabled (skeleton) & MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI) {
guint changed = 0; guint changed = 0;
@@ -314,6 +318,8 @@ mm_iface_modem_location_3gpp_update_lac_ci (MMIfaceModemLocation *self,
g_object_get (self, g_object_get (self,
MM_IFACE_MODEM_LOCATION_DBUS_SKELETON, &skeleton, MM_IFACE_MODEM_LOCATION_DBUS_SKELETON, &skeleton,
NULL); NULL);
if (!skeleton)
return;
if (mm_gdbus_modem_location_get_enabled (skeleton) & MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI) { if (mm_gdbus_modem_location_get_enabled (skeleton) & MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI) {
guint changed = 0; guint changed = 0;
@@ -340,6 +346,8 @@ mm_iface_modem_location_3gpp_clear (MMIfaceModemLocation *self)
g_object_get (self, g_object_get (self,
MM_IFACE_MODEM_LOCATION_DBUS_SKELETON, &skeleton, MM_IFACE_MODEM_LOCATION_DBUS_SKELETON, &skeleton,
NULL); NULL);
if (!skeleton)
return;
if (mm_gdbus_modem_location_get_enabled (skeleton) & MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI) { if (mm_gdbus_modem_location_get_enabled (skeleton) & MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI) {
guint changed = 0; guint changed = 0;