aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-02-23 00:02:25 -0600
committerTed Gould <ted@gould.cx>2012-02-23 00:02:25 -0600
commit55113b2baf6703debeef34a135260fafeb2b71c8 (patch)
treedd667ac87e007a48c6703763338ffbbc65ac77d4 /tests
parent49e45c8b23af0926ec04c50a4ac53068abba21db (diff)
parent8dc3a0013a6fd0d8ab54edf0944f842da751c4e7 (diff)
downloadlibdbusmenu-55113b2baf6703debeef34a135260fafeb2b71c8.tar.gz
libdbusmenu-55113b2baf6703debeef34a135260fafeb2b71c8.tar.bz2
libdbusmenu-55113b2baf6703debeef34a135260fafeb2b71c8.zip
* New upstream release.
* Fix label leak and make it not have disposition (LP: #937829)
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/Makefile.in4
-rw-r--r--tests/test-gtk-submenu-server.c1
3 files changed, 7 insertions, 2 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/Makefile.in b/tests/Makefile.in
index bd0e43f..91c60fd 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -48,7 +48,6 @@ TESTS = test-glib-objects-test test-glib-events test-glib-layout \
@WANT_LIBDBUSMENUGTK_TRUE@ test-gtk-label \
@WANT_LIBDBUSMENUGTK_TRUE@ test-gtk-shortcut \
@WANT_LIBDBUSMENUGTK_TRUE@ test-gtk-reorder \
-@WANT_LIBDBUSMENUGTK_TRUE@ test-gtk-submenu \
@WANT_LIBDBUSMENUGTK_TRUE@ test-gtk-parser-test
check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
@@ -689,6 +688,9 @@ EXTRA_DIST = test-glib-simple-items.py test-gtk-shortcut-client.py \
dbusmenu-gtk/mago_tests/data/static.json \
dbusmenu-gtk/mago_tests/data/test-gtk-label.json \
test-json-01.json
+# Not working with GTK3 and a critical grab that is in
+# the GTK3 code.
+# test-gtk-submenu
# The Python test only work on the system copy of
# dbusmenu, so while they can be usefule they're not
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");