From d8ad1966e4bc8745160386d704fe67c9000d4bb0 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sun, 11 Nov 2012 06:58:41 +0200 Subject: [libmate-desktop] make error traps use the new GTK APIs http://git.gnome.org/browse/gnome-desktop/commit/?id=da4d293870762064285231fba3a2a7c3c0d25838 --- libmate-desktop/mate-bg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libmate-desktop/mate-bg.c') diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c index 1423415..5252020 100644 --- a/libmate-desktop/mate-bg.c +++ b/libmate-desktop/mate-bg.c @@ -1306,7 +1306,7 @@ mate_bg_get_pixmap_from_root (GdkScreen *screen) w_ret, h_ret); } - gdk_error_trap_pop (); + gdk_error_trap_pop_ignored (); #else source_pixmap = gdk_pixmap_foreign_new (*(Pixmap *) data); gdk_error_trap_pop (); @@ -1408,8 +1408,12 @@ mate_bg_set_root_pixmap_id (GdkScreen *screen, nitems == 1) { gdk_error_trap_push (); XKillClient (display, *(Pixmap *)data_esetroot); +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); +#else gdk_flush (); gdk_error_trap_pop (); +#endif } XFree (data_esetroot); } -- cgit v1.2.1