diff --git a/daemon/src/client/client.cpp b/daemon/src/client/client.cpp index 0a4a1ef1f484e3695fafe1fd99f975a78d01676c..50ca6609697e3a1c24e94084727b4b8b439b12f2 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 56d8c0553c372b962c237235be93d07428fd7593..a7f09fe03a3723cf20fbffceb44f196158593651 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