diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2010-02-05 11:49:40 -0800 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2010-02-05 11:49:40 -0800 |
| commit | 67b12d9f2549670f528fd098c737d93761cd5d74 (patch) | |
| tree | a66ec57b2843046bb248964c6b4d6e081f54ca77 /tests/test-glib-layout-client.c | |
| parent | 730e7609ef6042130f945f8ac43a8220171fee37 (diff) | |
| parent | e8ac2fcb6cd946e90e873970976f6ae64354947c (diff) | |
| download | libdbusmenu-67b12d9f2549670f528fd098c737d93761cd5d74.tar.gz libdbusmenu-67b12d9f2549670f528fd098c737d93761cd5d74.tar.bz2 libdbusmenu-67b12d9f2549670f528fd098c737d93761cd5d74.zip | |
releasing version 0.2.3-0ubuntu1
Diffstat (limited to 'tests/test-glib-layout-client.c')
| -rw-r--r-- | tests/test-glib-layout-client.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c index bb2d13a..5ea0cf8 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); @@ -55,13 +57,13 @@ verify_root_to_layout(DbusmenuMenuitem * mi, layout_t * layout) } guint i = 0; - for (i = 0; children != NULL && layout->submenu[i].id != 0; children = g_list_next(children), i++) { + for (i = 0; children != NULL && layout->submenu[i].id != -1; children = g_list_next(children), i++) { if (!verify_root_to_layout(DBUSMENU_MENUITEM(children->data), &layout->submenu[i])) { return FALSE; } } - if (children == NULL && layout->submenu[i].id == 0) { + if (children == NULL && layout->submenu[i].id == -1) { return TRUE; } @@ -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); } |