aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLuke Yelavich <luke.yelavich@canonical.com>2012-03-08 15:49:05 +1100
committerLuke Yelavich <luke.yelavich@canonical.com>2012-03-08 15:49:05 +1100
commit357e0a1e969d2613b81f833a2936bcc71fc2470c (patch)
treeb08d95af4e3412974c382e96cdfab4b4178549cf /tests
parent13ca9a89915c4a06806d5f46bf304e2952848bd2 (diff)
parent33290b94668dec767edc167826e32f953f2e15ef (diff)
downloadlibdbusmenu-357e0a1e969d2613b81f833a2936bcc71fc2470c.tar.gz
libdbusmenu-357e0a1e969d2613b81f833a2936bcc71fc2470c.tar.bz2
libdbusmenu-357e0a1e969d2613b81f833a2936bcc71fc2470c.zip
Merge from trunk.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/test-gtk-submenu-server.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index db2d469..6824c1c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,8 +25,10 @@ TESTS += \
test-gtk-label \
test-gtk-shortcut \
test-gtk-reorder \
- test-gtk-submenu \
test-gtk-parser-test
+# Not working with GTK3 and a critical grab that is in
+# the GTK3 code.
+# test-gtk-submenu
endif
# The Python test only work on the system copy of
diff --git a/tests/test-gtk-submenu-server.c b/tests/test-gtk-submenu-server.c
index 9c4d7d4..1d38a44 100644
--- a/tests/test-gtk-submenu-server.c
+++ b/tests/test-gtk-submenu-server.c
@@ -64,6 +64,7 @@ on_bus (GDBusConnection * connection, const gchar * name, gpointer user_data)
DbusmenuMenuitem * item;
item = add_item(root, "Folder 1");
+ dbusmenu_menuitem_property_set(item, "disposition", "alert");
add_item(item, "1.1");
add_item(item, "1.2");
add_item(item, "1.3");