colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadband-bearer-sierra: use correct modem type when creating bearer

Browse Source 
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.
This commit is contained in:
Dan Williams
2014-02-18 12:19:25 -06:00
parent 1e30bad174
commit 502a5dbaf5
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sierra/mm-broadband-bearer-sierra.c
View File

@@ -442,7 +442,7 @@ mm_broadband_bearer_sierra_new_finish (GAsyncResult *res,
} }
void void
mm_broadband_bearer_sierra_new (MMBroadbandModemSierra *modem, mm_broadband_bearer_sierra_new (MMBroadbandModem *modem,
MMBearerProperties *config, MMBearerProperties *config,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,

2
plugins/sierra/mm-broadband-bearer-sierra.h
View File

@@ -48,7 +48,7 @@ struct _MMBroadbandBearerSierraClass {
GType mm_broadband_bearer_sierra_get_type (void); GType mm_broadband_bearer_sierra_get_type (void);
/* Default 3GPP bearer creation implementation */ /* Default 3GPP bearer creation implementation */
void mm_broadband_bearer_sierra_new (MMBroadbandModemSierra *modem, void mm_broadband_bearer_sierra_new (MMBroadbandModem *modem,
MMBearerProperties *config, MMBearerProperties *config,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,

2
plugins/sierra/mm-broadband-modem-sierra-icera.c
View File

@@ -85,7 +85,7 @@ modem_create_bearer (MMIfaceModem *self,
modem_create_bearer); modem_create_bearer);
mm_dbg ("Creating Sierra 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, properties,
NULL, /* cancellable */ NULL, /* cancellable */
(GAsyncReadyCallback)broadband_bearer_sierra_new_ready, (GAsyncReadyCallback)broadband_bearer_sierra_new_ready,

2
plugins/sierra/mm-broadband-modem-sierra.c
View File

@@ -1134,7 +1134,7 @@ modem_create_bearer (MMIfaceModem *self,
modem_create_bearer); modem_create_bearer);
mm_dbg ("Creating Sierra 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, properties,
NULL, /* cancellable */ NULL, /* cancellable */
(GAsyncReadyCallback)broadband_bearer_sierra_new_ready, (GAsyncReadyCallback)broadband_bearer_sierra_new_ready,