diff options
author | Aleksander Morgado <aleksander@lanedo.com> | 2013-02-17 20:27:24 +0100 |
---|---|---|
committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-02-18 15:41:26 +0100 |
commit | 15d34d56fd3277b23c5f477d9aab257cb0bc10a7 (patch) | |
tree | d236228bfdd57acf160333925a507493664d80b3 /src/mm-broadband-bearer.h | |
parent | 1746949277cbcf9209fc67b36a091177a8476b29 (diff) |
bearer: new helper 'MMBearerConnectResult' type
Instead of returning 3 variables in connect_finish(), return a single reference
counted struct. This simplifies how the result is built and passed within a
GSimpleAsyncResult to each _finish() method.
This also simplifies the dialling step in the 3GPP connection sequence, as we
can use the same new type.
Diffstat (limited to 'src/mm-broadband-bearer.h')
-rw-r--r-- | src/mm-broadband-bearer.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/mm-broadband-bearer.h b/src/mm-broadband-bearer.h index 2cce5708..5e35be50 100644 --- a/src/mm-broadband-bearer.h +++ b/src/mm-broadband-bearer.h @@ -13,6 +13,7 @@ * Author: Aleksander Morgado <aleksander@lanedo.com> * * Copyright (C) 2011 - 2012 Google, Inc. + * Copyright (C) 2011 - 2013 Aleksander Morgado <aleksander@gnu.org> */ #ifndef MM_BROADBAND_BEARER_H @@ -55,12 +56,9 @@ struct _MMBroadbandBearerClass { GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); - gboolean (* connect_3gpp_finish) (MMBroadbandBearer *self, - GAsyncResult *res, - MMPort **data, - MMBearerIpConfig **ipv4_config, - MMBearerIpConfig **ipv6_config, - GError **error); + MMBearerConnectResult * (* connect_3gpp_finish) (MMBroadbandBearer *self, + GAsyncResult *res, + GError **error); /* Dialing sub-part of 3GPP connection */ void (* dial_3gpp) (MMBroadbandBearer *self, @@ -113,12 +111,9 @@ struct _MMBroadbandBearerClass { GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); - gboolean (* connect_cdma_finish) (MMBroadbandBearer *self, - GAsyncResult *res, - MMPort **data, - MMBearerIpConfig **ipv4_config, - MMBearerIpConfig **ipv6_config, - GError **error); + MMBearerConnectResult * (* connect_cdma_finish) (MMBroadbandBearer *self, + GAsyncResult *res, + GError **error); /* Full CDMA disconnection sequence */ void (* disconnect_cdma) (MMBroadbandBearer *self, |