← Back to branch summary

~ubuntu-branches/ubuntu/wily/xfce4-power-manager/wily

« back to all changes in this revision

Viewing changes to src/egg-idletime.c

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-06-25 19:13:23 UTC
  • mfrom: (21.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20140625191323-w7xzyk3dkwkk15uh
Tags: 1.3.0-1ubuntu1
https://launchpad.net/bugs/1334185
* Merge from debian. (LP: #1334185) Remaining changes:
  - Switch to using logind for session tracking. Depend on systemd-services
    and add libsystemd-login-dev build dependency.
* Use upower << 0.99
* Drop all patches, fixed upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/egg-idletime.c
30
30
#include <gdk/gdk.h>
31
31
 
32
32
#include <stdio.h>
 
33
#ifdef HAVE_STDLIB_H
33
34
#include <stdlib.h>
 
35
#endif
 
36
#ifdef HAVE_STRING_H
34
37
#include <string.h>
 
38
#endif
35
39
 
36
40
#include "egg-idletime.h"
37
41
 
396
400
        idletime->priv->reset_set = FALSE;
397
401
        idletime->priv->idle_counter = None;
398
402
        idletime->priv->sync_event = 0;
399
 
        idletime->priv->dpy = GDK_DISPLAY ();
 
403
        idletime->priv->dpy = gdk_x11_get_default_xdisplay ();
400
404
 
401
405
        /* get the sync event */
402
406
        if (!XSyncQueryExtension (idletime->priv->dpy, &idletime->priv->sync_event, &sync_error)) {