diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-09-01 16:03:48 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-09-01 16:03:48 +0200 |
commit | 98cb370ffb40eab57ed739ecdc47b875525f2b27 (patch) | |
tree | 2e6d62a7ea0e0276b5c134a71d4748697ba89bd5 /src/Daemon/CommLayerServerDBus.h | |
parent | 2a9c7637018dd144caa04679ed7fbfbe90b6eb13 (diff) | |
download | abrt-98cb370ffb40eab57ed739ecdc47b875525f2b27.tar.gz abrt-98cb370ffb40eab57ed739ecdc47b875525f2b27.tar.xz abrt-98cb370ffb40eab57ed739ecdc47b875525f2b27.zip |
CommLayerServerDBus: rewrote to use dbus, not dbus-c++
Expect some rough edges.
On the plus side:
(1) -15 kb in our own code:
text data bss dec hex filename
209057 2664 2640 214361 34559 abrt.z5/abrt-0.0.8/src/Daemon/.libs/abrt
194958 2576 2320 199854 30cae abrt.z6/abrt-0.0.8/src/Daemon/.libs/abrt
(2) this will allow us to stop using libdbus-c++-1.so.0 in the future
(-200kb of code)
(3) a lot of logging added (most on -vvv verbosity level) to help with debug
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, 2 insertions, 32 deletions
diff --git a/src/Daemon/CommLayerServerDBus.h b/src/Daemon/CommLayerServerDBus.h index 8824ca39..fffdd783 100644 --- a/src/Daemon/CommLayerServerDBus.h +++ b/src/Daemon/CommLayerServerDBus.h @@ -1,55 +1,25 @@ #ifndef COMMLAYERSERVERDBUS_H_ #define COMMLAYERSERVERDBUS_H_ -#include <dbus-c++/dbus.h> -#include <dbus/dbus.h> -#include <dbus-c++/glib-integration.h> #include "CommLayerServer.h" class CCommLayerServerDBus -: public CCommLayerServer, - public DBus::InterfaceAdaptor, -// public DBus::IntrospectableAdaptor, - public DBus::ObjectAdaptor +: public CCommLayerServer { - private: - DBus::Connection *m_pConn; - static DBus::Connection *init_dbus(CCommLayerServerDBus *self); - public: CCommLayerServerDBus(); virtual ~CCommLayerServerDBus(); - /* DBus call handlers */ - private: - 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); - /* DBus signal senders */ - public: virtual void Crash(const std::string& progname, const std::string& uid); virtual void AnalyzeComplete(const map_crash_report_t& arg1); virtual void Error(const std::string& arg1); virtual void Update(const std::string& pMessage, uint64_t pJobID); //the job id should be enough in jobdone virtual void JobDone(const std::string& pDest, uint64_t pJobID); - virtual void JobStarted(const std::string &pDest, uint64_t pJobID); + virtual void JobStarted(const std::string& pDest, uint64_t pJobID); virtual void Warning(const std::string& pMessage); virtual void Warning(const std::string& pMessage, uint64_t pJobID); }; -/* - * This must be done before instances of CCommLayerServerDBus are created - * (otherwise "new DBus::Connection(DBus::Connection::SystemBus())" fails) - */ -void attach_dbus_dispatcher_to_glib_main_context(); - #endif |