From 906f8773bbe800f97bb6c18e383d7302fe86fb08 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Fri, 30 Sep 2011 09:35:32 +0200
Subject: gtk: fix compilation for gtk2

gdk_error_trap_pop_ignored() is not present in gtk2.

https://bugs.launchpad.net/bugs/862553
---
 src/canberra-gtk-module.c | 6 ++++++
 1 file changed, 6 insertions(+)

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;
-- 
cgit