diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-15 11:54:43 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-15 11:54:43 -0600 |
| commit | d96e8ddcadc023ab9ac5bb9ff932011cd6788b5a (patch) | |
| tree | b557d324cadaf66a63b7f2220da364640c1fcc88 /tests | |
| parent | 931994f499108dec95c7e6c9022848667b69848f (diff) | |
| parent | e1094452eda0314065bb1b02d616d573c0367a74 (diff) | |
| download | libdbusmenu-d96e8ddcadc023ab9ac5bb9ff932011cd6788b5a.tar.gz libdbusmenu-d96e8ddcadc023ab9ac5bb9ff932011cd6788b5a.tar.bz2 libdbusmenu-d96e8ddcadc023ab9ac5bb9ff932011cd6788b5a.zip | |
Syncing up to the group properties branch so our tests pass
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/json-loader.c | 1 | ||||
| -rw-r--r-- | tests/test-glib-layout-client.c | 5 |
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)) { |