summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2015-12-04 13:17:37 -0500
committerMatthias Clasen <mclasen@redhat.com>2015-12-04 13:22:26 -0500
commitf19cadeaf3e85f3b5347b85e50241c97d623903c (patch)
treef81645fd1e65441daa4e627df60a21b6732c23b5 /testsuite
parent03769e3830ca3c8ab8265ac1a52d4000e52409d9 (diff)
downloadgtk+-f19cadeaf3e85f3b5347b85e50241c97d623903c.tar.gz
testsuite: Fix notify tests
GtkStatusIcon tests don't work well under xwayland either, so just skip them unconditionally. GtkEntry now fails because the update of the im-module is no longer deferred to an idle, and (gtk-im-simple) is not a valid module name, so skip this property.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/gtk/notify.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index e15a4a886e..9468593c6b 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -423,13 +423,8 @@ test_type (gconstpointer data)
return;
#endif
-#ifdef GDK_WINDOWING_WAYLAND
- if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
- {
- if (g_type_is_a (type, GTK_TYPE_STATUS_ICON))
- return;
- }
-#endif
+ if (g_type_is_a (type, GTK_TYPE_STATUS_ICON))
+ return;
klass = g_type_class_ref (type);
@@ -490,6 +485,10 @@ test_type (gconstpointer data)
))
continue;
+ if (pspec->owner_type == GTK_TYPE_ENTRY &&
+ g_str_equal (pspec->name, "im-module"))
+ continue;
+
if (type == GTK_TYPE_SETTINGS)
continue;