summaryrefslogtreecommitdiff
path: root/libmate-desktop/mate-desktop-item.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-03-07 00:08:10 +0100
committerStefano Karapetsas <[email protected]>2014-03-07 00:08:10 +0100
commit34e86df9a8608aa88b5712e23ba02e0f4da4aaef (patch)
tree1eb3809a111b4e7336cbbe337804e59c9a072bc0 /libmate-desktop/mate-desktop-item.c
parentff1ebe30c989cea51c2c33183e2a652394ce6a9c (diff)
parent0eef05307bd0c2acb5c780b8f85a239ca810625d (diff)
downloadmate-desktop-34e86df9a8608aa88b5712e23ba02e0f4da4aaef.tar.bz2
mate-desktop-34e86df9a8608aa88b5712e23ba02e0f4da4aaef.tar.xz
Merge pull request #102 from dnk/rgba
gtk3: GdkRGBA support
Diffstat (limited to 'libmate-desktop/mate-desktop-item.c')
-rw-r--r--libmate-desktop/mate-desktop-item.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmate-desktop/mate-desktop-item.c b/libmate-desktop/mate-desktop-item.c
index eb004d9..06f585a 100644
--- a/libmate-desktop/mate-desktop-item.c
+++ b/libmate-desktop/mate-desktop-item.c
@@ -1480,7 +1480,11 @@ static void
sn_error_trap_pop (SnDisplay *display,
Display *xdisplay)
{
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gdk_error_trap_pop_ignored();
+#else
gdk_error_trap_pop ();
+#endif
}
static char **