summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-02-18 12:19:25 -0600
committerDan Williams <dcbw@redhat.com>2014-06-13 11:30:49 -0500
commit502a5dbaf5555515cf6a81d69403aaf6aa6ea656 (patch)
tree6563fe1d1814a23c327967993660a11a98ac42cb
parent1e30bad1741a7322142e7cf129f92cdfff4f9216 (diff)
broadband-bearer-sierra: use correct modem type when creating bearer
MMBroadbandModemSierraIcera is not a subclass of MMBroadbandModemSierra, so we cannot cast it to that type when passing it to bearer creation. Luckily the bearer doesn't care, so just downgrade the type to MMBroadbandModem.
-rw-r--r--plugins/sierra/mm-broadband-bearer-sierra.c2
-rw-r--r--plugins/sierra/mm-broadband-bearer-sierra.h2
-rw-r--r--plugins/sierra/mm-broadband-modem-sierra-icera.c2
-rw-r--r--plugins/sierra/mm-broadband-modem-sierra.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/sierra/mm-broadband-bearer-sierra.c b/plugins/sierra/mm-broadband-bearer-sierra.c
index 67cb3f27..dbe8a448 100644
--- a/plugins/sierra/mm-broadband-bearer-sierra.c
+++ b/plugins/sierra/mm-broadband-bearer-sierra.c
@@ -442,7 +442,7 @@ mm_broadband_bearer_sierra_new_finish (GAsyncResult *res,
}
void
-mm_broadband_bearer_sierra_new (MMBroadbandModemSierra *modem,
+mm_broadband_bearer_sierra_new (MMBroadbandModem *modem,
MMBearerProperties *config,
GCancellable *cancellable,
GAsyncReadyCallback callback,
diff --git a/plugins/sierra/mm-broadband-bearer-sierra.h b/plugins/sierra/mm-broadband-bearer-sierra.h
index 92a5acc8..98b0735c 100644
--- a/plugins/sierra/mm-broadband-bearer-sierra.h
+++ b/plugins/sierra/mm-broadband-bearer-sierra.h
@@ -48,7 +48,7 @@ struct _MMBroadbandBearerSierraClass {
GType mm_broadband_bearer_sierra_get_type (void);
/* Default 3GPP bearer creation implementation */
-void mm_broadband_bearer_sierra_new (MMBroadbandModemSierra *modem,
+void mm_broadband_bearer_sierra_new (MMBroadbandModem *modem,
MMBearerProperties *config,
GCancellable *cancellable,
GAsyncReadyCallback callback,
diff --git a/plugins/sierra/mm-broadband-modem-sierra-icera.c b/plugins/sierra/mm-broadband-modem-sierra-icera.c
index d9a4e400..e01ea0a0 100644
--- a/plugins/sierra/mm-broadband-modem-sierra-icera.c
+++ b/plugins/sierra/mm-broadband-modem-sierra-icera.c
@@ -85,7 +85,7 @@ modem_create_bearer (MMIfaceModem *self,
modem_create_bearer);
mm_dbg ("Creating Sierra bearer...");
- mm_broadband_bearer_sierra_new (MM_BROADBAND_MODEM_SIERRA (self),
+ mm_broadband_bearer_sierra_new (MM_BROADBAND_MODEM (self),
properties,
NULL, /* cancellable */
(GAsyncReadyCallback)broadband_bearer_sierra_new_ready,
diff --git a/plugins/sierra/mm-broadband-modem-sierra.c b/plugins/sierra/mm-broadband-modem-sierra.c
index 8d06b017..e49c84cb 100644
--- a/plugins/sierra/mm-broadband-modem-sierra.c
+++ b/plugins/sierra/mm-broadband-modem-sierra.c
@@ -1134,7 +1134,7 @@ modem_create_bearer (MMIfaceModem *self,
modem_create_bearer);
mm_dbg ("Creating Sierra bearer...");
- mm_broadband_bearer_sierra_new (MM_BROADBAND_MODEM_SIERRA (self),
+ mm_broadband_bearer_sierra_new (MM_BROADBAND_MODEM (self),
properties,
NULL, /* cancellable */
(GAsyncReadyCallback)broadband_bearer_sierra_new_ready,