diff options
| author | Benjamin Berg <bberg@redhat.com> | 2019-02-25 16:42:24 +0100 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2019-03-22 13:20:22 +0100 |
| commit | 02db279067d683481521817c5e7581cb910f38ed (patch) | |
| tree | c9c92d25ce38e1d27b9ad157ae9bc35c9f132808 | |
| parent | e1a27d72952fceff73885004770bdf869898894f (diff) | |
| download | gnome-settings-daemon-02db279067d683481521817c5e7581cb910f38ed.tar.gz | |
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.
| -rw-r--r-- | plugins/power/gpm-common.c | 4 |
1 files 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); |