ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #01936
[Branch ~dbusmenu-team/dbusmenu/trunk] Rev 137: Test fixes.
------------------------------------------------------------
revno: 137
committer: Cody Russell <crussell@xxxxxxxxxxxxx>
branch nick: fix-menu-order
timestamp: Thu 2010-07-22 21:05:53 +0200
message:
Test fixes.
modified:
tests/Makefile.am
tests/test-gtk-submenu-server.c
--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk
Your team ayatana-commits is subscribed to branch lp:dbusmenu.
To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2010-07-22 08:44:33 +0000
+++ tests/Makefile.am 2010-07-22 19:05:53 +0000
@@ -10,7 +10,6 @@
test-glib-proxy \
test-glib-simple-items \
test-glib-submenu \
- test-json \
test-gtk-objects-test \
test-gtk-label \
test-gtk-shortcut \
=== modified file 'tests/test-gtk-submenu-server.c'
--- tests/test-gtk-submenu-server.c 2010-07-22 08:44:33 +0000
+++ tests/test-gtk-submenu-server.c 2010-07-22 19:05:53 +0000
@@ -29,6 +29,16 @@
#include <libdbusmenu-glib/menuitem.h>
#include <libdbusmenu-glib/server.h>
+static GMainLoop *mainloop = NULL;
+
+static gboolean
+timer_func (gpointer data)
+{
+ g_main_loop_quit (mainloop);
+
+ return FALSE;
+}
+
DbusmenuMenuitem *
add_item(DbusmenuMenuitem * parent, const char * label)
{
@@ -76,7 +86,9 @@
add_item(item, "2.2");
add_item(item, "2.3");
- GMainLoop * mainloop = g_main_loop_new(NULL, FALSE);
+ g_timeout_add_seconds(3, timer_func, NULL);
+
+ mainloop = g_main_loop_new(NULL, FALSE);
g_main_loop_run(mainloop);
g_debug("Quiting");