diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-04 23:30:25 -0800 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-04 23:30:25 -0800 |
| commit | 9b0c52147aa3e9b2e90731f1c21e59e500799022 (patch) | |
| tree | 515022b9e7ccbfc940d3da638f1b1cb5e07ee277 /tests/test-glib-layout-client.c | |
| parent | 103580a46bcffaae27e8dafc6cf943ad465cb2fa (diff) | |
| parent | a94d7042028da404cb336c0a0e9fcdadb2406a61 (diff) | |
| download | libdbusmenu-9b0c52147aa3e9b2e90731f1c21e59e500799022.tar.gz libdbusmenu-9b0c52147aa3e9b2e90731f1c21e59e500799022.tar.bz2 libdbusmenu-9b0c52147aa3e9b2e90731f1c21e59e500799022.zip | |
* Upstrem Merge
* Fixing the range nd default.
Diffstat (limited to 'tests/test-glib-layout-client.c')
| -rw-r--r-- | tests/test-glib-layout-client.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c index bb2d13a..82228b5 100644 --- a/tests/test-glib-layout-client.c +++ b/tests/test-glib-layout-client.c @@ -36,8 +36,10 @@ verify_root_to_layout(DbusmenuMenuitem * mi, layout_t * layout) g_debug("Verifying ID: %d", layout->id); if (layout->id != dbusmenu_menuitem_get_id(mi)) { - g_debug("Failed as ID %d is not equal to %d", layout->id, dbusmenu_menuitem_get_id(mi)); - return FALSE; + if (!(dbusmenu_menuitem_get_root(mi) && dbusmenu_menuitem_get_id(mi) == 0)) { + g_debug("Failed as ID %d is not equal to %d", layout->id, dbusmenu_menuitem_get_id(mi)); + return FALSE; + } } GList * children = dbusmenu_menuitem_get_children(mi); @@ -88,7 +90,7 @@ layout_updated (DbusmenuClient * client, gpointer data) layouton++; - if (layouts[layouton].id == 0) { + if (layouts[layouton].id == -1) { g_main_loop_quit(mainloop); } |