3 files changed, 7 insertions, 7 deletions
diff --git a/lib/CommLayer/CommLayerServer.h b/lib/CommLayer/CommLayerServer.h
index bc4082fa..fa8023a4 100644
--- a/lib/CommLayer/CommLayerServer.h
+++ b/lib/CommLayer/CommLayerServer.h
@@ -29,7 +29,7 @@ class CCommLayerServer{
     public:
         CMiddleWare *m_pMW;
         CCommLayerServer(CMiddleWare *pMW);
-        ~CCommLayerServer();
+        virtual ~CCommLayerServer();
         /* observer */
         void Attach(CObserver *pObs);
         void Detach(CObserver *pObs);
diff --git a/lib/CommLayer/CommLayerServerDBus.cpp b/lib/CommLayer/CommLayerServerDBus.cpp
index a5eb4372..33bb2f9b 100644
--- a/lib/CommLayer/CommLayerServerDBus.cpp
+++ b/lib/CommLayer/CommLayerServerDBus.cpp
@@ -4,9 +4,9 @@
 DBus::Connection *CCommLayerServerDBus::init_dbus(CCommLayerServerDBus *self)
 {
     CCommLayerServerDBus *server = (CCommLayerServerDBus*) self;
-    server->dispatcher = new DBus::Glib::BusDispatcher();
-    server->dispatcher->attach(NULL);
-    DBus::default_dispatcher = self->dispatcher;
+    server->m_pDispatcher = new DBus::Glib::BusDispatcher();
+    server->m_pDispatcher->attach(NULL);
+    DBus::default_dispatcher = self->m_pDispatcher;
 	server->m_pConn = new DBus::Connection(DBus::Connection::SystemBus());
     return server->m_pConn;
 }
@@ -23,7 +23,7 @@ CCommLayerServerDBus::CCommLayerServerDBus(CMiddleWare *pMW)
 CCommLayerServerDBus::~CCommLayerServerDBus()
 {
     std::cout << "Cleaning up dbus" << std::endl;
-    delete dispatcher;
+    delete m_pDispatcher;
 }
 
 dbus_vector_crash_infos_t CCommLayerServerDBus::GetCrashInfos(const std::string &pUID)
diff --git a/lib/CommLayer/CommLayerServerDBus.h b/lib/CommLayer/CommLayerServerDBus.h
index 9bd29c73..175be21b 100644
--- a/lib/CommLayer/CommLayerServerDBus.h
+++ b/lib/CommLayer/CommLayerServerDBus.h
@@ -12,11 +12,11 @@ class CCommLayerServerDBus
 {
     private:
         DBus::Connection *m_pConn;
-        DBus::Glib::BusDispatcher *dispatcher;
+        DBus::Glib::BusDispatcher *m_pDispatcher;
         static DBus::Connection *init_dbus(CCommLayerServerDBus *self);
     public:
         CCommLayerServerDBus(CMiddleWare *m_pMW);
-        ~CCommLayerServerDBus();
+        virtual ~CCommLayerServerDBus();
 
         virtual dbus_vector_crash_infos_t GetCrashInfos(const std::string &pUID);
         virtual dbus_vector_map_crash_infos_t GetCrashInfosMap(const std::string &pDBusSender);