From fd6d9f9fc7d28556c2c5835f4e375a1befa87559 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 29 Oct 2009 15:28:26 -0500 Subject: [PATCH] Fix: Don't pass ofono_network_operator structures --- src/cbs.c | 12 ++++++------ src/gprs.c | 2 +- src/ofono.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cbs.c b/src/cbs.c index 0529879..42594c7 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; diff --git a/src/gprs.c b/src/gprs.c index 5327da2..d5f9dc9 100644 --- a/src/gprs.c +++ b/src/gprs.c @@ -569,7 +569,7 @@ static void gprs_netreg_update(struct ofono_gprs *gprs) } static void netreg_status_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_gprs *gprs = data; diff --git a/src/ofono.h b/src/ofono.h index 54500d6..44ab853 100644 --- a/src/ofono.h +++ b/src/ofono.h @@ -208,7 +208,7 @@ void __ofono_ussd_passwd_unregister(struct ofono_ussd *ussd, const char *sc); #include typedef void (*ofono_netreg_status_notify_cb_t)(int status, int lac, int ci, - int tech, const struct ofono_network_operator *op, + int tech, const char *mcc, const char *mnc, void *data); unsigned int __ofono_netreg_add_status_watch(struct ofono_netreg *netreg, -- 2.7.4