summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2011-09-30 09:35:32 +0200
committerLennart Poettering <lennart@poettering.net>2011-10-11 02:16:21 +0200
commit906f8773bbe800f97bb6c18e383d7302fe86fb08 (patch)
tree58bbd5f6863b8114202fb4f9b19ea439776840a2
parentfb9342952eb91e7542f2d279061013cfbb990645 (diff)
gtk: fix compilation for gtk2
gdk_error_trap_pop_ignored() is not present in gtk2. https://bugs.launchpad.net/bugs/862553
-rw-r--r--src/canberra-gtk-module.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
index e777121..67791f0 100644
--- a/src/canberra-gtk-module.c
+++ b/src/canberra-gtk-module.c
@@ -379,7 +379,13 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
&data) != Success) {
return FALSE;
}
+
+#if GTK_CHECK_VERSION(3,0,0)
gdk_error_trap_pop_ignored();
+#else
+ gdk_flush();
+ gdk_error_trap_pop();
+#endif
if (type_return == xembed && format_return == 32 && data)
ret = TRUE;