From a94d7042028da404cb336c0a0e9fcdadb2406a61 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 4 Feb 2010 23:18:24 -0800 Subject: Changing key value to -1 and having the id be a gint. Also not working about id mismatch with root. --- tests/test-glib-layout-client.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/test-glib-layout-client.c') 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); } -- cgit v1.2.3