diff options
| author | Steve Zesch <[email protected]> | 2012-01-09 22:14:20 -0500 |
|---|---|---|
| committer | Steve Zesch <[email protected]> | 2012-01-09 22:14:20 -0500 |
| commit | e554754f5681592f0f7b1d41e0943a89470f3796 (patch) | |
| tree | 223db9350604b352a18d6b6f6ed330600afafeef /typing-break | |
| parent | 035a4e3cfa5782aaa4967cf923a1364eba3b056b (diff) | |
| parent | b9c28ef703e934e8dc137686984f04c7b0d2d010 (diff) | |
| download | mate-control-center-e554754f5681592f0f7b1d41e0943a89470f3796.tar.bz2 mate-control-center-e554754f5681592f0f7b1d41e0943a89470f3796.tar.xz | |
Merge branch 'master' of https://github.com/mate-desktop/mate-control-center
Diffstat (limited to 'typing-break')
| -rw-r--r-- | typing-break/drw-monitor.c | 4 | ||||
| -rw-r--r-- | typing-break/drw-selection.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/typing-break/drw-monitor.c b/typing-break/drw-monitor.c index 5f0270c0..c4dd348a 100644 --- a/typing-break/drw-monitor.c +++ b/typing-break/drw-monitor.c @@ -146,7 +146,7 @@ drw_monitor_timeout (DrwMonitor *monitor) priv = monitor->priv; - if (XScreenSaverQueryInfo (GDK_DISPLAY (), DefaultRootWindow (GDK_DISPLAY ()), priv->ss_info) != 0) { + if (XScreenSaverQueryInfo (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), DefaultRootWindow (GDK_DISPLAY_XDISPLAY(gdk_display_get_default())), priv->ss_info) != 0) { if (priv->ss_info->idle < priv->last_idle) { now = time (NULL); @@ -172,7 +172,7 @@ drw_monitor_setup (DrwMonitor *monitor) priv = monitor->priv; - if (!XScreenSaverQueryExtension (GDK_DISPLAY (), &event_base, &error_base)) { + if (!XScreenSaverQueryExtension (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), &event_base, &error_base)) { return FALSE; } diff --git a/typing-break/drw-selection.c b/typing-break/drw-selection.c index 99b0980e..28a96533 100644 --- a/typing-break/drw-selection.c +++ b/typing-break/drw-selection.c @@ -70,7 +70,7 @@ drw_selection_clear (GtkWidget *widget, static gboolean drw_selection_find_existing (DrwSelection *drw_selection) { - Display *xdisplay = GDK_DISPLAY (); + Display *xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); Window old; gdk_error_trap_push (); @@ -120,7 +120,7 @@ drw_selection_claim (DrwSelection *drw_selection) static void drw_selection_negotiate (DrwSelection *drw_selection) { - Display *xdisplay = GDK_DISPLAY (); + Display *xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); gboolean found = FALSE; /* We don't need both the XGrabServer() and the loop here; |