From 8327cdabe469a75c52c9663b52a9519cf9400424 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
Date: Tue, 29 Apr 2014 18:14:43 -0400
Subject: [PATCH] client: do not compile undefined types
Change-Id: I6c839bb4689f461b2ff5954e13af0fa7fe1f215c
Refs: #46447
---
daemon/src/client/client.cpp | 4 ++++
daemon/src/client/client.h | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/daemon/src/client/client.cpp b/daemon/src/client/client.cpp
index 0a4a1ef1f4..50ca660969 100644
--- a/daemon/src/client/client.cpp
+++ b/daemon/src/client/client.cpp
@@ -44,8 +44,10 @@ Client::Client() : callManager_(new CallManager)
#ifdef SFL_PRESENCE
, presenceManager_(new PresenceManager)
#endif
+#if HAVE_DBUS
, instanceManager_(0)
, dispatcher_(0)
+#endif
#ifdef SFL_VIDEO
, videoControls_(0)
#endif
@@ -62,8 +64,10 @@ Client::~Client()
#ifdef SFL_VIDEO
delete videoControls_;
#endif
+#if HAVE_DBUS
delete dispatcher_;
delete instanceManager_;
+#endif
delete configurationManager_;
#ifdef SFL_PRESENCE
delete presenceManager_;
diff --git a/daemon/src/client/client.h b/daemon/src/client/client.h
index 56d8c0553c..a7f09fe03a 100644
--- a/daemon/src/client/client.h
+++ b/daemon/src/client/client.h
@@ -49,9 +49,11 @@ class PresenceManager;
class VideoControls;
#endif
+#if HAVE_DBUS
namespace DBus {
class BusDispatcher;
}
+#endif
class Client {
public:
@@ -80,8 +82,10 @@ class Client {
#ifdef SFL_PRESENCE
PresenceManager* presenceManager_;
#endif
+#if HAVE_DBUS
Instance* instanceManager_;
DBus::BusDispatcher* dispatcher_;
+#endif
#ifdef SFL_VIDEO
VideoControls *videoControls_;
#endif
--
GitLab