diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2009-05-20 12:35:15 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-05-20 13:06:23 -0500 |
| commit | a76864dd5f7f2bfefc768e53ed4228f60ddcab5d (patch) | |
| tree | f9569e998c01c3f9542436defa4b0ad44432f2fb | |
| parent | e220d45b86091e40921a9fe42e0ba721903d2090 (diff) | |
| download | ofono-a76864dd5f7f2bfefc768e53ed4228f60ddcab5d.tar.bz2 | |
Fixup SS control case
In certain cases, querying/setting prperties via SS control req
doesn't provide complete state, resulting in subsequent
GetProperties reporting incorrect values
| -rw-r--r-- | src/call-forwarding.c | 1 | ||||
| -rw-r--r-- | src/call-waiting.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/call-forwarding.c b/src/call-forwarding.c index aaaf8be5..b2ce0872 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -1145,6 +1145,7 @@ static gboolean cf_ss_control(struct ofono_modem *modem, int type, const char *s cf->ss_req->cls = cls; cf->pending = dbus_message_ref(msg); + cls |= BEARER_CLASS_DEFAULT | BEARER_CLASS_SMS; switch (cf->ss_req->ss_type) { case SS_CONTROL_TYPE_REGISTRATION: diff --git a/src/call-waiting.c b/src/call-waiting.c index 360aa68f..312d9ac9 100644 --- a/src/call-waiting.c +++ b/src/call-waiting.c @@ -306,6 +306,7 @@ static void cw_ss_set_callback(const struct ofono_error *error, void *data) { struct ofono_modem *modem = data; struct call_waiting_data *cw = modem->call_waiting; + int cls; if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { ofono_debug("setting CW via SS failed"); @@ -315,6 +316,8 @@ static void cw_ss_set_callback(const struct ofono_error *error, void *data) return; } + cls = cw->ss_req_cls | BEARER_CLASS_DEFAULT; + cw->ops->query(modem, cw->ss_req_cls, cw_ss_query_callback, modem); } @@ -365,6 +368,8 @@ static gboolean cw_ss_control(struct ofono_modem *modem, int type, cw->ss_req_cls = cls; cw->pending = dbus_message_ref(msg); + cls |= BEARER_CLASS_DEFAULT; + switch (type) { case SS_CONTROL_TYPE_REGISTRATION: case SS_CONTROL_TYPE_ACTIVATION: |