[gnome-settings-daemon/wip/benzea/cleanups-and-small-fixes: 47/51] power: Use X11 specific error trap functions

[Benjamin Berg <bberg src gnome org>]

commit e99e0f684da559d94b1b76a1cc840a72e614d4e9
Author: Benjamin Berg <bberg redhat com>
Date:   Mon Feb 25 16:42:24 2019 +0100

    power: Use X11 specific error trap functions
    
    These are used to guard an X11 specific all (which will hopefully be
    removed soon). Doing so fixes a compile time warning.

 plugins/power/gpm-common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c
index 079b36ce..4458c187 100644
--- a/plugins/power/gpm-common.c
+++ b/plugins/power/gpm-common.c
@@ -303,10 +303,10 @@ gsd_power_enable_screensaver_watchdog (void)
         /* Make sure that Xorg's DPMS extension never gets in our
          * way. The defaults are now applied in Fedora 20 from
          * being "0" by default to being "600" by default */
-        gdk_error_trap_push ();
+        gdk_x11_display_error_trap_push (gdk_display_get_default ());
         if (DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy))
                 DPMSSetTimeouts (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0, 0);
-        gdk_error_trap_pop_ignored ();
+        gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default ());
         id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT,
                                     disable_builtin_screensaver,
                                     NULL);