diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-25 15:31:42 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-25 15:31:42 +0200 |
| commit | facd7083bc1c5f097b7d6795780670644ccfbb1f (patch) | |
| tree | 80b633429bd29dba7a49f8e37d57dfef96833654 /src/Daemon/CommLayerServerDBus.h | |
| parent | febce6de166c50a55eb0cba05cff385a9ca4a917 (diff) | |
| download | abrt-facd7083bc1c5f097b7d6795780670644ccfbb1f.tar.gz abrt-facd7083bc1c5f097b7d6795780670644ccfbb1f.tar.xz abrt-facd7083bc1c5f097b7d6795780670644ccfbb1f.zip | |
eliminate one-use class CDBusServer_adaptor
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'src/Daemon/CommLayerServerDBus.h')
| -rw-r--r-- | src/Daemon/CommLayerServerDBus.h | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/src/Daemon/CommLayerServerDBus.h b/src/Daemon/CommLayerServerDBus.h index 18e71f90..bbc0c3d1 100644 --- a/src/Daemon/CommLayerServerDBus.h +++ b/src/Daemon/CommLayerServerDBus.h @@ -1,24 +1,39 @@ -#include "CommLayerServer.h" +#ifndef COMMLAYERSERVERDBUS_H_ +#define COMMLAYERSERVERDBUS_H_ #include <dbus-c++/dbus.h> #include <dbus-c++/glib-integration.h> -#include "DBusServerProxy.h" -#include <iostream> +#include "CommLayerServer.h" class CCommLayerServerDBus : public CCommLayerServer, - public CDBusServer_adaptor, - public DBus::IntrospectableAdaptor, + public DBus::InterfaceAdaptor, +// public DBus::IntrospectableAdaptor, public DBus::ObjectAdaptor { private: DBus::Connection *m_pConn; static DBus::Connection *init_dbus(CCommLayerServerDBus *self); + public: CCommLayerServerDBus(); virtual ~CCommLayerServerDBus(); /* DBus call handlers */ + private: + /* unmarshalers */ + DBus::Message _GetCrashInfos_stub(const DBus::CallMessage &call); + DBus::Message _CreateReport_stub(const DBus::CallMessage &call); + DBus::Message _Report_stub(const DBus::CallMessage &call); + DBus::Message _DeleteDebugDump_stub(const DBus::CallMessage &call); + DBus::Message _GetJobResult_stub(const DBus::CallMessage &call); + DBus::Message _GetPluginsInfo_stub(const DBus::CallMessage &call); + DBus::Message _GetPluginSettings_stub(const DBus::CallMessage &call); + DBus::Message _SetPluginSettings_stub(const DBus::CallMessage &call); + DBus::Message _RegisterPlugin_stub(const DBus::CallMessage &call); + DBus::Message _UnRegisterPlugin_stub(const DBus::CallMessage &call); + public: + /* handlers */ virtual vector_crash_infos_t GetCrashInfos(const std::string& pSender); virtual uint64_t CreateReport_t(const std::string& pUUID, const std::string& pSender); virtual report_status_t Report(const map_crash_report_t& pReport, const std::string& pSender); @@ -30,15 +45,14 @@ class CCommLayerServerDBus virtual void RegisterPlugin(const std::string& pName); virtual void UnRegisterPlugin(const std::string& pName); - /* Double duty: */ - /* (1) implement CCommLayerServer's virtuals */ - /* (2) propagate values to CDBusServer_adaptor::<same_name>() in order to send a DBus signal */ + /* DBus signal senders */ + public: virtual void Crash(const std::string& arg1); virtual void AnalyzeComplete(const map_crash_report_t& arg1); virtual void Error(const std::string& arg1); virtual void Update(const std::string& pDest, const std::string& pMessage); virtual void JobDone(const std::string& pDest, uint64_t pJobID); - virtual void Warning(const std::string& pDest, const std::string& pMessage); + virtual void Warning(const std::string& pMessage); }; /* @@ -46,3 +60,5 @@ class CCommLayerServerDBus * (otherwise "new DBus::Connection(DBus::Connection::SystemBus())" fails) */ void attach_dbus_dispatcher_to_glib_main_context(); + +#endif |