diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2012-03-04 20:33:57 -0800 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2012-03-04 20:33:57 -0800 |
commit | c4cac92c5c9928acae85e9e2d555c33b7ada0c50 (patch) | |
tree | cd2d6566558a984522b62cdd0a0fa7325a607156 /src/clock.c | |
parent | 3b76f9ac7610314bbb9f41b4e5365b24ade8e560 (diff) | |
download | connman-c4cac92c5c9928acae85e9e2d555c33b7ada0c50.tar.gz connman-c4cac92c5c9928acae85e9e2d555c33b7ada0c50.tar.bz2 connman-c4cac92c5c9928acae85e9e2d555c33b7ada0c50.zip |
clock: Revert change to accept variant of variant
Diffstat (limited to 'src/clock.c')
-rw-r--r-- | src/clock.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/clock.c b/src/clock.c index db4974de..0d7f8705 100644 --- a/src/clock.c +++ b/src/clock.c @@ -179,11 +179,6 @@ static DBusMessage *set_property(DBusConnection *conn, struct timeval tv; dbus_uint64_t newval; - if (type == DBUS_TYPE_VARIANT) { - DBusMessageIter variant = value; - dbus_message_iter_recurse(&variant, &value); - type = dbus_message_iter_get_arg_type(&value); - } if (type != DBUS_TYPE_UINT64) return __connman_error_invalid_arguments(msg); @@ -205,11 +200,6 @@ static DBusMessage *set_property(DBusConnection *conn, const char *strval; enum time_updates newval; - if (type == DBUS_TYPE_VARIANT) { - DBusMessageIter variant = value; - dbus_message_iter_recurse(&variant, &value); - type = dbus_message_iter_get_arg_type(&value); - } if (type != DBUS_TYPE_STRING) return __connman_error_invalid_arguments(msg); @@ -230,11 +220,6 @@ static DBusMessage *set_property(DBusConnection *conn, } else if (g_str_equal(name, "Timezone") == TRUE) { const char *strval; - if (type == DBUS_TYPE_VARIANT) { - DBusMessageIter variant = value; - dbus_message_iter_recurse(&variant, &value); - type = dbus_message_iter_get_arg_type(&value); - } if (type != DBUS_TYPE_STRING) return __connman_error_invalid_arguments(msg); @@ -249,11 +234,6 @@ static DBusMessage *set_property(DBusConnection *conn, const char *strval; enum timezone_updates newval; - if (type == DBUS_TYPE_VARIANT) { - DBusMessageIter variant = value; - dbus_message_iter_recurse(&variant, &value); - type = dbus_message_iter_get_arg_type(&value); - } if (type != DBUS_TYPE_STRING) return __connman_error_invalid_arguments(msg); @@ -274,11 +254,6 @@ static DBusMessage *set_property(DBusConnection *conn, } else if (g_str_equal(name, "Timeservers") == TRUE) { DBusMessageIter entry; - if (type == DBUS_TYPE_VARIANT) { - DBusMessageIter variant = value; - dbus_message_iter_recurse(&variant, &value); - type = dbus_message_iter_get_arg_type(&value); - } if (type != DBUS_TYPE_ARRAY) return __connman_error_invalid_arguments(msg); |