diff options
author | Denis Kenzior <denkenz@gmail.com> | 2010-07-08 14:06:01 -0500 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2010-07-08 14:27:34 -0500 |
commit | 00cb839c837140aa97bba6bfb9592dc05b875380 (patch) | |
tree | 9747990888badd885efe747a19532855c54edb41 /src | |
parent | ab9d7cd2cb6d5a7749e65d10c2146dfd925b2188 (diff) | |
download | ofono-00cb839c837140aa97bba6bfb9592dc05b875380.tar.bz2 |
style: Use more understandable syntax
Diffstat (limited to 'src')
-rw-r--r-- | src/stk.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -234,7 +234,7 @@ static DBusMessage *stk_get_properties(DBusConnection *conn, DBusMessage *reply; DBusMessageIter iter; DBusMessageIter dict; - const char *idle_mode_text = stk->idle_mode_text ?: ""; + const char *idle_mode_text; reply = dbus_message_new_method_return(msg); if (!reply) @@ -246,6 +246,7 @@ static DBusMessage *stk_get_properties(DBusConnection *conn, OFONO_PROPERTIES_ARRAY_SIGNATURE, &dict); + idle_mode_text = stk->idle_mode_text ? stk->idle_mode_text : ""; ofono_dbus_dict_append(&dict, "IdleModeText", DBUS_TYPE_STRING, &idle_mode_text); @@ -365,7 +366,7 @@ static gboolean handle_command_set_idle_text(const struct stk_command *cmd, if (cmd->setup_idle_mode_text.text) stk->idle_mode_text = g_strdup(cmd->setup_idle_mode_text.text); - idle_mode_text = stk->idle_mode_text ?: ""; + idle_mode_text = stk->idle_mode_text ? stk->idle_mode_text : ""; ofono_dbus_signal_property_changed(conn, path, OFONO_STK_INTERFACE, "IdleModeText", DBUS_TYPE_STRING, |