diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-11-16 14:02:19 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2015-12-02 12:54:10 +0100 |
| commit | 8ea8868b6e6cfa626905b52b4b94b10b60d43139 (patch) | |
| tree | 8b280cf03d6569a1991f82b3449f8714bd31ebed /plugins/media-keys/msd-media-keys-manager.c | |
| parent | ef58118cad934b5fa5bf5ca1abe2d7f3d6f56836 (diff) | |
| download | mate-settings-daemon-8ea8868b6e6cfa626905b52b4b94b10b60d43139.tar.bz2 mate-settings-daemon-8ea8868b6e6cfa626905b52b4b94b10b60d43139.tar.xz | |
GTK3: use gdk_error_trap_pop_ignored() when appropriate
taken from:
https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=544526d
Diffstat (limited to 'plugins/media-keys/msd-media-keys-manager.c')
| -rw-r--r-- | plugins/media-keys/msd-media-keys-manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c index 24b32ec..d34e50b 100644 --- a/plugins/media-keys/msd-media-keys-manager.c +++ b/plugins/media-keys/msd-media-keys-manager.c @@ -1204,7 +1204,11 @@ msd_media_keys_manager_stop (MsdMediaKeysManager *manager) if (need_flush) gdk_flush (); +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); +#else gdk_error_trap_pop (); +#endif g_slist_free (priv->screens); priv->screens = NULL; |