aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-02-17 09:34:03 -0600
committerTed Gould <ted@gould.cx>2011-02-17 09:34:03 -0600
commit0f14c6a987ee8287bcba2d891ecf7bc99f1c287a (patch)
treef15a16fe8c93e53f049187cdd0f9a8a0c5812f91 /tests
parent4b371488bdf2db32c7f6ca4fdef8474d21f2ecbd (diff)
parente1094452eda0314065bb1b02d616d573c0367a74 (diff)
downloadlibdbusmenu-0f14c6a987ee8287bcba2d891ecf7bc99f1c287a.tar.gz
libdbusmenu-0f14c6a987ee8287bcba2d891ecf7bc99f1c287a.tar.bz2
libdbusmenu-0f14c6a987ee8287bcba2d891ecf7bc99f1c287a.zip
Group property changes into a single signal and change GetLayout to not use XML
Diffstat (limited to 'tests')
-rw-r--r--tests/json-loader.c1
-rw-r--r--tests/test-glib-layout-client.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/json-loader.c b/tests/json-loader.c
index 14e90e0..36157dc 100644
--- a/tests/json-loader.c
+++ b/tests/json-loader.c
@@ -109,7 +109,6 @@ set_props (DbusmenuMenuitem * mi, JsonObject * node)
if (variant != NULL) {
dbusmenu_menuitem_property_set_variant(mi, member, variant);
- g_variant_unref(variant);
}
}
diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c
index 5ea0cf8..3afe042 100644
--- a/tests/test-glib-layout-client.c
+++ b/tests/test-glib-layout-client.c
@@ -81,6 +81,11 @@ layout_updated (DbusmenuClient * client, gpointer data)
g_debug("Layout Updated");
DbusmenuMenuitem * menuroot = dbusmenu_client_get_root(client);
+ if (menuroot == NULL) {
+ g_debug("Root NULL, waiting");
+ return;
+ }
+
layout_t * layout = &layouts[layouton];
if (!verify_root_to_layout(menuroot, layout)) {