← Back to branch summary

~ari-tczew/ubuntu/natty/clementine/lp-747113

« back to all changes in this revision

Viewing changes to src/ui/screensaver.cpp

  • Committer: Artur Rona
  • Date: 2011-04-04 20:05:33 UTC
  • Revision ID: ari-tczew@ubuntu.com-20110404200533-6aclzasj5pp8t1hq
https://launchpad.net/bugs/747113
* New upstream release. (LP: #747113)
* Drop all patches, have been applied upstream.
* Update debian/copyright.
* Refresh description in debian/control in order to avoid lintian error.
* Bump debhelper to 8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ui/screensaver.cpp
15
15
   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
16
16
*/
17
17
 
 
18
#include "config.h"
18
19
#include "screensaver.h"
19
20
 
20
21
#include <QtGlobal>
21
22
 
22
 
#ifdef Q_WS_X11
 
23
#ifdef HAVE_DBUS
23
24
  #include "dbusscreensaver.h"
24
25
  #include <QDBusConnection>
25
26
  #include <QDBusConnectionInterface>
42
43
 
43
44
Screensaver* Screensaver::GetScreensaver() {
44
45
  if (!screensaver_) {
45
 
    #if defined(Q_WS_X11)
 
46
    #if defined(HAVE_DBUS)
46
47
      if (QDBusConnection::sessionBus().interface()->isServiceRegistered(kGnomeService)) {
47
48
        screensaver_ = new DBusScreensaver(kGnomeService, kGnomePath, kGnomeInterface);
48
49
      } else if (QDBusConnection::sessionBus().interface()->isServiceRegistered(kKdeService)) {