summaryrefslogtreecommitdiffstats
path: root/src/cbs.c
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2009-10-29 15:28:26 -0500
committerDenis Kenzior <denkenz@gmail.com>2009-10-29 15:28:26 -0500
commitfd6d9f9fc7d28556c2c5835f4e375a1befa87559 (patch)
tree55130a248b0b43534f8557b3939de049b4fd807e /src/cbs.c
parent177c9672d1fd5b01ba713125a5d6349d65e673fb (diff)
downloadofono-fd6d9f9fc7d28556c2c5835f4e375a1befa87559.tar.bz2
Fix: Don't pass ofono_network_operator structures
Diffstat (limited to 'src/cbs.c')
-rw-r--r--src/cbs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cbs.c b/src/cbs.c
index 0529879e..42594c76 100644
--- a/src/cbs.c
+++ b/src/cbs.c
@@ -700,7 +700,7 @@ out:
}
static void cbs_location_changed(int status, int lac, int ci, int tech,
- const struct ofono_network_operator *op,
+ const char *mcc, const char *mnc,
void *data)
{
struct ofono_cbs *cbs = data;
@@ -708,9 +708,9 @@ static void cbs_location_changed(int status, int lac, int ci, int tech,
gboolean lac_changed = FALSE;
gboolean ci_changed = FALSE;
- DBG("%d, %d, %d, %d, %p", status, lac, ci, tech, op);
+ DBG("%d, %d, %d, %d, %s%s", status, lac, ci, tech, mcc, mnc);
- if (op == NULL) {
+ if (!mcc || !mnc) {
if (cbs->mcc[0] == '\0' && cbs->mnc[0] == '\0')
return;
@@ -721,9 +721,9 @@ static void cbs_location_changed(int status, int lac, int ci, int tech,
goto out;
}
- if (strcmp(cbs->mcc, op->mcc) || strcmp(cbs->mnc, op->mnc)) {
- memcpy(cbs->mcc, op->mcc, sizeof(cbs->mcc));
- memcpy(cbs->mnc, op->mnc, sizeof(cbs->mnc));
+ if (strcmp(cbs->mcc, mcc) || strcmp(cbs->mnc, mnc)) {
+ memcpy(cbs->mcc, mcc, sizeof(cbs->mcc));
+ memcpy(cbs->mnc, mnc, sizeof(cbs->mnc));
plmn_changed = TRUE;
goto out;