diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2010-11-22 16:32:27 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-11-22 16:32:27 -0600 |
| commit | d1de85e5a4bf2e82922f32d5bdaabc117f0ea7fb (patch) | |
| tree | 3b4fa53b3517d036cd67750c90589ee9df137db9 /src/call-settings.c | |
| parent | 6c2099fd8e1507fe43fbba66eb9fb83969afd034 (diff) | |
| download | ofono-d1de85e5a4bf2e82922f32d5bdaabc117f0ea7fb.tar.bz2 | |
call-settings: Fix style issues
Diffstat (limited to 'src/call-settings.c')
| -rw-r--r-- | src/call-settings.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/call-settings.c b/src/call-settings.c index 73d16a2c..c6568336 100644 --- a/src/call-settings.c +++ b/src/call-settings.c @@ -709,7 +709,7 @@ static gboolean clir_ss_control(int type, /* This is the temporary form of CLIR, handled in voicecalls */ if (!strlen(sia) && !strlen(sib) & !strlen(sic) && - strlen(dn) && type != SS_CONTROL_TYPE_QUERY) + strlen(dn) && type != SS_CONTROL_TYPE_QUERY) return FALSE; if (strlen(sia) || strlen(sib) || strlen(sic) || strlen(dn)) { @@ -719,8 +719,14 @@ static gboolean clir_ss_control(int type, return TRUE; } - if ((type == SS_CONTROL_TYPE_QUERY && !cs->driver->clir_query) || - (type != SS_CONTROL_TYPE_QUERY && !cs->driver->clir_set)) { + if (type == SS_CONTROL_TYPE_QUERY && cs->driver->clir_query == NULL) { + DBusMessage *reply = __ofono_error_not_implemented(msg); + g_dbus_send_message(conn, reply); + + return TRUE; + } + + if (type != SS_CONTROL_TYPE_QUERY && !cs->driver->clir_set) { DBusMessage *reply = __ofono_error_not_implemented(msg); g_dbus_send_message(conn, reply); |