diff options
| author | Ted Gould <ted@gould.cx> | 2012-04-09 09:15:17 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-04-09 09:15:17 -0500 |
| commit | 475110aa2fe3a47cf6331fbd5941f34a9461fd81 (patch) | |
| tree | bf2318e8b94cf0b74ea17b496e9d5331a3c065ec /tests/json-loader.c | |
| parent | e0eb750e8c36a4116247ea80b4d055a9f821459a (diff) | |
| parent | 2d60549a2394ce7d73907abcaca22b48553d6c5b (diff) | |
| download | libdbusmenu-475110aa2fe3a47cf6331fbd5941f34a9461fd81.tar.gz libdbusmenu-475110aa2fe3a47cf6331fbd5941f34a9461fd81.tar.bz2 libdbusmenu-475110aa2fe3a47cf6331fbd5941f34a9461fd81.zip | |
Catching up to trunk
Diffstat (limited to 'tests/json-loader.c')
| -rw-r--r-- | tests/json-loader.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/tests/json-loader.c b/tests/json-loader.c index 7f0ec8e..94982c4 100644 --- a/tests/json-loader.c +++ b/tests/json-loader.c @@ -24,6 +24,18 @@ with this program. If not, see <http://www.gnu.org/licenses/>. static GVariant * node2variant (JsonNode * node, const gchar * name); static void +array_byte_foreach (JsonArray * array, guint index, JsonNode * node, gpointer user_data) +{ + g_return_if_fail(JSON_NODE_TYPE(node) == JSON_NODE_VALUE); + g_return_if_fail(json_node_get_value_type(node) == G_TYPE_INT || json_node_get_value_type(node) == G_TYPE_INT64); + + GVariantBuilder * builder = (GVariantBuilder *)user_data; + + g_variant_builder_add_value(builder, g_variant_new_byte(json_node_get_int(node))); + return; +} + +static void array_foreach (JsonArray * array, guint index, JsonNode * node, gpointer user_data) { GVariantBuilder * builder = (GVariantBuilder *)user_data; @@ -79,11 +91,17 @@ node2variant (JsonNode * node, const gchar * name) } if (JSON_NODE_TYPE(node) == JSON_NODE_ARRAY) { + JsonArray * array = json_node_get_array(node); GVariantBuilder builder; - g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY); - JsonArray * array = json_node_get_array(node); - json_array_foreach_element(array, array_foreach, &builder); + if (g_strcmp0(name, "icon-data") == 0) { + g_variant_builder_init(&builder, G_VARIANT_TYPE("ay")); + json_array_foreach_element(array, array_byte_foreach, &builder); + } else { + g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY); + json_array_foreach_element(array, array_foreach, &builder); + } + return g_variant_builder_end(&builder); } |