diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-05 11:00:07 -0800 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-05 11:00:07 -0800 |
| commit | c77ed1ccc280c56949b0a5a3f2d8d08bae498d29 (patch) | |
| tree | 4b8cc5313c3c6828565df8efad57ab85d53f4d3a /tests/test-glib-properties-server.c | |
| parent | a61a7ba8cc024d3d75f73e336ba83128631d3019 (diff) | |
| parent | f3a13c8b0be55927b8b91ff37ba922ba323b44b7 (diff) | |
| download | libdbusmenu-c77ed1ccc280c56949b0a5a3f2d8d08bae498d29.tar.gz libdbusmenu-c77ed1ccc280c56949b0a5a3f2d8d08bae498d29.tar.bz2 libdbusmenu-c77ed1ccc280c56949b0a5a3f2d8d08bae498d29.zip | |
* Upstrem Merge
* Fixing handing of root IDs being zero
* Handling syncing of properties when reusing items
* Shipping new JSON files and READMEs for testing.
Diffstat (limited to 'tests/test-glib-properties-server.c')
| -rw-r--r-- | tests/test-glib-properties-server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-glib-properties-server.c b/tests/test-glib-properties-server.c index 8dad37f..091e550 100644 --- a/tests/test-glib-properties-server.c +++ b/tests/test-glib-properties-server.c @@ -46,14 +46,14 @@ set_props (DbusmenuMenuitem * mi, gchar ** props) static DbusmenuMenuitem * layout2menuitem (proplayout_t * layout) { - if (layout == NULL || layout->id == 0) return NULL; + if (layout == NULL || layout->id == -1) return NULL; DbusmenuMenuitem * local = dbusmenu_menuitem_new_with_id(layout->id); set_props(local, layout->properties); if (layout->submenu != NULL) { guint count; - for (count = 0; layout->submenu[count].id != 0; count++) { + for (count = 0; layout->submenu[count].id != -1; count++) { DbusmenuMenuitem * child = layout2menuitem(&layout->submenu[count]); if (child != NULL) { dbusmenu_menuitem_child_append(local, child); @@ -72,7 +72,7 @@ static GMainLoop * mainloop = NULL; static gboolean timer_func (gpointer data) { - if (layouts[layouton].id == 0) { + if (layouts[layouton].id == -1) { g_main_loop_quit(mainloop); return FALSE; } |