move huge inlines out of DBusClientProxy.h to DBusClientProxy.cpp

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

6 files changed, 286 insertions, 198 deletions

diff --git a/lib/CommLayer/DBusClientProxy.cpp b/lib/CommLayer/DBusClientProxy.cpp
new file mode 100644
index 00000000..4f51172d
--- /dev/null
+++ b/lib/CommLayer/DBusClientProxy.cpp
@@ -0,0 +1,238 @@
+/*
+    Copyright (C) 2009  Jiri Moskovcak (jmoskovc@redhat.com)
+    Copyright (C) 2009  RedHat inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    */
+
+#include "DBusClientProxy.h"
+#include <iostream>
+
+namespace org {
+namespace freedesktop {
+namespace DBus {
+
+/* class DaemonWatcher_proxy */
+
+/* public: */
+
+DaemonWatcher_proxy::DaemonWatcher_proxy()
+: ::DBus::InterfaceProxy("org.freedesktop.DBus")
+{
+    m_pStateChangeHandler_cb_data = NULL;
+    m_pStateChangeHandler = NULL;
+    connect_signal(DaemonWatcher_proxy, NameOwnerChanged , _DaemonStateChanged);
+}
+
+void DaemonWatcher_proxy::ConnectStateChangeHandler(void (*pStateChangeHandler)(bool running, void* data), void *cb_data)
+{
+    m_pStateChangeHandler_cb_data = cb_data;
+    m_pStateChangeHandler = pStateChangeHandler;
+}
+
+/* private: */
+
+/* unmarshalers (to unpack the DBus message before calling the actual signal handler)
+ */
+void DaemonWatcher_proxy::_DaemonStateChanged(const ::DBus::SignalMessage &sig)
+{
+    ::DBus::MessageIter ri = sig.reader();
+    std::string name;
+    std::string old_owner;
+    std::string new_owner;
+    ri >> name;
+    ri >> old_owner;
+    ri >> new_owner;
+    if(name.compare("com.redhat.abrt") == 0)
+    {
+        if(new_owner.length() > 0)
+        {
+            if(m_pStateChangeHandler)
+            {
+                m_pStateChangeHandler(true,m_pStateChangeHandler_cb_data);
+            }
+            else
+            {
+                std::cout << "Daemon appeared!" << std::endl;
+            }
+        }
+        if(new_owner.length() == 0)
+        {
+            if(m_pStateChangeHandler)
+            {
+                m_pStateChangeHandler(false, m_pStateChangeHandler_cb_data);
+            }
+            else
+            {
+                std::cout << "Daemon dissapeared!" << std::endl;
+            }
+        }
+    }
+}
+
+} } } /* closing namespaces */
+
+
+/* class DaemonWatcher */
+
+/* public: */
+
+DaemonWatcher::DaemonWatcher(DBus::Connection &connection, const char *path, const char *name)
+: ::DBus::ObjectProxy(connection, path, name)
+{
+}
+DaemonWatcher::~DaemonWatcher()
+{
+    std::cout << "~DaemonWatcher" << std::endl;
+}
+
+
+/* class CDBusClient_proxy */
+
+/* public: */
+
+CDBusClient_proxy::CDBusClient_proxy()
+: DBus::InterfaceProxy(CC_DBUS_IFACE)
+{
+    connect_signal(CDBusClient_proxy, Crash, _Crash_stub);
+    connect_signal(CDBusClient_proxy, JobDone, _JobDone_stub);
+    m_sConnName = "";
+}
+
+CDBusClient_proxy::CDBusClient_proxy(::DBus::Connection &pConnection)
+: DBus::InterfaceProxy(CC_DBUS_IFACE)
+{
+    gloop = g_main_loop_new(NULL, false);
+    //# define connect_signal(interface, signal, callback)
+    connect_signal(CDBusClient_proxy, Crash, _Crash_stub);
+    connect_signal(CDBusClient_proxy, JobDone, _JobDone_stub);
+    m_sConnName = pConnection.unique_name();
+}
+
+/* methods exported by this interface,
+ * this functions will invoke the corresponding methods on the remote objects
+ */
+ /*
+
+ <
+  <m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage>
+  <m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage>
+  <m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage>
+  ...
+  >
+  */
+vector_crash_infos_t CDBusClient_proxy::GetCrashInfos()
+{
+    DBus::CallMessage call;
+    DBus::MessageIter wi = call.writer();
+
+    call.member("GetCrashInfos");
+    DBus::Message ret = invoke_method(call);
+    DBus::MessageIter ri = ret.reader();
+
+    vector_crash_infos_t argout;
+    ri >> argout;
+    return argout;
+}
+
+bool CDBusClient_proxy::DeleteDebugDump(const std::string& pUUID)
+{
+    DBus::CallMessage call;
+
+    DBus::MessageIter wi = call.writer();
+
+    wi << pUUID;
+    call.member("DeleteDebugDump");
+    DBus::Message ret = invoke_method(call);
+    DBus::MessageIter ri = ret.reader();
+
+    bool argout;
+    ri >> argout;
+    return argout;
+}
+
+map_crash_report_t CDBusClient_proxy::CreateReport(const std::string& pUUID)
+{
+    m_bJobDone = false;
+    DBus::CallMessage call;
+
+    DBus::MessageIter wi = call.writer();
+
+    wi << pUUID;
+    call.member("CreateReport");
+    DBus::Message ret = invoke_method(call);
+    DBus::MessageIter ri = ret.reader();
+    ri >> m_iPendingJobID;
+    //FIXME: what if the report is created before we start the loop? (we miss the signal and get stuck in the loop)
+    g_main_loop_run(gloop);
+    return GetJobResult(m_iPendingJobID);
+};
+
+void CDBusClient_proxy::Report(map_crash_report_t pReport)
+{
+    DBus::CallMessage call;
+
+    DBus::MessageIter wi = call.writer();
+
+    wi << pReport;
+    call.member("Report");
+    DBus::Message ret = invoke_method(call);
+    DBus::MessageIter ri = ret.reader();
+}
+
+map_crash_report_t CDBusClient_proxy::GetJobResult(uint64_t pJobID)
+{
+    DBus::CallMessage call;
+
+    DBus::MessageIter wi = call.writer();
+
+    wi << pJobID;
+    call.member("GetJobResult");
+    DBus::Message ret = invoke_method(call);
+    DBus::MessageIter ri = ret.reader();
+    map_crash_report_t argout;
+    ri >> argout;
+    return argout;
+}
+
+/* signal handlers for this interface
+ */
+void CDBusClient_proxy::Crash(std::string& value)
+{
+}
+
+/* private: */
+
+/* unmarshalers (to unpack the DBus message before calling the actual signal handler)
+ */
+void CDBusClient_proxy::_Crash_stub(const ::DBus::SignalMessage &sig)
+{
+    DBus::MessageIter ri = sig.reader();
+
+    std::string value; ri >> value;
+    Crash(value);
+}
+
+void CDBusClient_proxy::_JobDone_stub(const ::DBus::SignalMessage &sig)
+{
+    DBus::MessageIter ri = sig.reader();
+    std::string dest;
+    ri >> dest;
+    if(m_sConnName == dest)
+    {
+        ri >> m_iPendingJobID;
+        g_main_loop_quit(gloop);
+    }
+}
diff --git a/lib/CommLayer/DBusClientProxy.h b/lib/CommLayer/DBusClientProxy.h
index 0293b0a9..5b5c1fde 100644
--- a/lib/CommLayer/DBusClientProxy.h
+++ b/lib/CommLayer/DBusClientProxy.h
@@ -16,11 +16,13 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
+#ifndef DBUSCLIENTPROXY_H_
+#define DBUSCLIENTPROXY_H_
 
 #include <dbus-c++/dbus.h>
 #include <dbus-c++/glib-integration.h>
 #include "DBusCommon.h"
-#include <iostream>
+
 #define ABRT_NOT_RUNNING 0
 #define ABRT_RUNNING 1
 
@@ -29,69 +31,25 @@ namespace freedesktop {
 namespace DBus {
 
 class DaemonWatcher_proxy
- : public ::DBus::InterfaceProxy
+: public ::DBus::InterfaceProxy
 {
 private:
     void *m_pStateChangeHandler_cb_data;
     void (*m_pStateChangeHandler)(bool running, void* data);
-public:
 
-    DaemonWatcher_proxy()
-    : ::DBus::InterfaceProxy("org.freedesktop.DBus")
-    {
-        m_pStateChangeHandler_cb_data = NULL;
-        m_pStateChangeHandler = NULL;
-        connect_signal(DaemonWatcher_proxy, NameOwnerChanged , _DaemonStateChanged);
-    }
+public:
+    DaemonWatcher_proxy();
+    void ConnectStateChangeHandler(void (*pStateChangeHandler)(bool running, void* data), void *cb_data);
 
-    void ConnectStateChangeHandler(void (*pStateChangeHandler)(bool running, void* data), void *cb_data)
-    {
-        m_pStateChangeHandler_cb_data = cb_data;
-        m_pStateChangeHandler = pStateChangeHandler;
-    }
 private:
-
     /* unmarshalers (to unpack the DBus message before calling the actual signal handler)
      */
-    void _DaemonStateChanged(const ::DBus::SignalMessage &sig)
-    {
-        ::DBus::MessageIter ri = sig.reader();
-        std::string name;
-        std::string old_owner;
-        std::string new_owner;
-        ri >> name;
-        ri >> old_owner;
-        ri >> new_owner;
-        if(name.compare("com.redhat.abrt") == 0)
-	{
-            if(new_owner.length() > 0)
-            {
-                if(m_pStateChangeHandler)
-                {
-                    m_pStateChangeHandler(true,m_pStateChangeHandler_cb_data);
-                }
-                else
-                {
-                    std::cout << "Daemon appeared!" << std::endl;
-                }
-            }
-            if(new_owner.length() == 0)
-            {
-                if(m_pStateChangeHandler)
-                {
-                    m_pStateChangeHandler(false, m_pStateChangeHandler_cb_data);
-                }
-                else
-                {
-                    std::cout << "Daemon dissapeared!" << std::endl;
-                }
-            }
-        }
-    }
+    void _DaemonStateChanged(const ::DBus::SignalMessage &sig);
 };
 
 } } }
 
+
 class DaemonWatcher
 : public org::freedesktop::DBus::DaemonWatcher_proxy,
   public DBus::IntrospectableProxy,
@@ -99,161 +57,52 @@ class DaemonWatcher
 {
 public:
 
-    DaemonWatcher(DBus::Connection &connection, const char *path, const char *name)
-    : ::DBus::ObjectProxy(connection, path, name)
-    {
-    }
-    ~DaemonWatcher()
-    {
-        std::cout << "~DaemonWatcher" << std::endl;
-    }
+    DaemonWatcher(DBus::Connection &connection, const char *path, const char *name);
+    ~DaemonWatcher();
 };
 
 
 class CDBusClient_proxy
- : public DBus::InterfaceProxy
+: public DBus::InterfaceProxy
 {
 private:
     bool m_bJobDone;
     uint64_t m_iPendingJobID;
     GMainLoop *gloop;
     std::string m_sConnName;
-public:
-
-
-    CDBusClient_proxy()
-    : DBus::InterfaceProxy(CC_DBUS_IFACE)
-    {
-        connect_signal(CDBusClient_proxy, Crash, _Crash_stub);
-        connect_signal(CDBusClient_proxy, JobDone, _JobDone_stub);
-        m_sConnName = "";
-    }
-
-    CDBusClient_proxy(::DBus::Connection &pConnection)
-    : DBus::InterfaceProxy(CC_DBUS_IFACE)
-    {
-        gloop = g_main_loop_new(NULL, false);
-        //# define connect_signal(interface, signal, callback)
-        connect_signal(CDBusClient_proxy, Crash, _Crash_stub);
-        connect_signal(CDBusClient_proxy, JobDone, _JobDone_stub);
-        m_sConnName = pConnection.unique_name();
-    }
 
 public:
+    CDBusClient_proxy();
+    CDBusClient_proxy(::DBus::Connection &pConnection);
 
+public:
     /* methods exported by this interface,
      * this functions will invoke the corresponding methods on the remote objects
      */
-     /*
-
+    /*
      <
       <m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage>
       <m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage>
       <m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage>
       ...
       >
-      */
-    vector_crash_infos_t GetCrashInfos()
-    {
-        DBus::CallMessage call;
-        DBus::MessageIter wi = call.writer();
-
-        call.member("GetCrashInfos");
-        DBus::Message ret = invoke_method(call);
-        DBus::MessageIter ri = ret.reader();
-
-        vector_crash_infos_t argout;
-        ri >> argout;
-        return argout;
-    }
-
-    bool DeleteDebugDump(const std::string& pUUID)
-    {
-        DBus::CallMessage call;
-
-        DBus::MessageIter wi = call.writer();
-
-        wi << pUUID;
-        call.member("DeleteDebugDump");
-        DBus::Message ret = invoke_method(call);
-        DBus::MessageIter ri = ret.reader();
-
-        bool argout;
-        ri >> argout;
-        return argout;
-    }
-
-    map_crash_report_t CreateReport(const std::string& pUUID)
-    {
-        m_bJobDone = false;
-        DBus::CallMessage call;
-
-        DBus::MessageIter wi = call.writer();
-
-        wi << pUUID;
-        call.member("CreateReport");
-        DBus::Message ret = invoke_method(call);
-        DBus::MessageIter ri = ret.reader();
-        ri >> m_iPendingJobID;
-        //FIXME: what if the report is created before we start the loop? (we miss the signal and get stuck in the loop)
-        g_main_loop_run(gloop);
-        return GetJobResult(m_iPendingJobID);
-    };
-
-    void Report(map_crash_report_t pReport)
-    {
-        DBus::CallMessage call;
-
-        DBus::MessageIter wi = call.writer();
-
-        wi << pReport;
-        call.member("Report");
-        DBus::Message ret = invoke_method(call);
-        DBus::MessageIter ri = ret.reader();
-    }
-
-    map_crash_report_t GetJobResult(uint64_t pJobID)
-    {
-        DBus::CallMessage call;
-
-        DBus::MessageIter wi = call.writer();
-
-        wi << pJobID;
-        call.member("GetJobResult");
-        DBus::Message ret = invoke_method(call);
-        DBus::MessageIter ri = ret.reader();
-        map_crash_report_t argout;
-        ri >> argout;
-        return argout;
-    }
+     */
+    vector_crash_infos_t GetCrashInfos();
+    bool DeleteDebugDump(const std::string& pUUID);
+    map_crash_report_t CreateReport(const std::string& pUUID);
+    void Report(map_crash_report_t pReport);
+    map_crash_report_t GetJobResult(uint64_t pJobID);
 
 public:
-
     /* signal handlers for this interface
      */
-    virtual void Crash(std::string& value){}
+    virtual void Crash(std::string& value);
 
 private:
-
     /* unmarshalers (to unpack the DBus message before calling the actual signal handler)
      */
-    void _Crash_stub(const ::DBus::SignalMessage &sig)
-    {
-        DBus::MessageIter ri = sig.reader();
-
-        std::string value; ri >> value;
-        Crash(value);
-    }
-
-    void _JobDone_stub(const ::DBus::SignalMessage &sig)
-    {
-        DBus::MessageIter ri = sig.reader();
-        std::string dest;
-        ri >> dest;
-        if(m_sConnName == dest)
-        {
-            ri >> m_iPendingJobID;
-            g_main_loop_quit(gloop);
-        }
-    }
+    void _Crash_stub(const ::DBus::SignalMessage &sig);
+    void _JobDone_stub(const ::DBus::SignalMessage &sig);
 };
+
+#endif
diff --git a/lib/CommLayer/DBusServerProxy.cpp b/lib/CommLayer/DBusServerProxy.cpp
index 24aaaad3..d4aee84d 100644
--- a/lib/CommLayer/DBusServerProxy.cpp
+++ b/lib/CommLayer/DBusServerProxy.cpp
@@ -18,11 +18,6 @@
     */
 
 #include "DBusServerProxy.h"
-//#include <dbus-c++/dbus.h>
-//#include <dbus-c++/glib-integration.h>
-//#include "DBusCommon.h"
-//#include <map>
-//#include <iostream>
 #include <stdlib.h>
 
 /* public: */
diff --git a/lib/CommLayer/DBusServerProxy.h b/lib/CommLayer/DBusServerProxy.h
index 9ade7a67..ae597e25 100644
--- a/lib/CommLayer/DBusServerProxy.h
+++ b/lib/CommLayer/DBusServerProxy.h
@@ -22,9 +22,6 @@
 #include <dbus-c++/dbus.h>
 #include <dbus-c++/glib-integration.h>
 #include "DBusCommon.h"
-//#include <map>
-//#include <iostream>
-//#include <stdlib.h>
 
 class CDBusServer_adaptor
 : public DBus::InterfaceAdaptor
diff --git a/lib/CommLayer/Makefile.am b/lib/CommLayer/Makefile.am
index a7ab193e..f80683b3 100644
--- a/lib/CommLayer/Makefile.am
+++ b/lib/CommLayer/Makefile.am
@@ -5,11 +5,11 @@ libABRTCommLayer_la_SOURCES = \
     CommLayerServerSocket.h CommLayerServerSocket.cpp \
     CommLayerServerDBus.h CommLayerServerDBus.cpp \
     DBusServerProxy.h DBusServerProxy.cpp \
-    Observer.h \
-    DBusCommon.h \
+    DBusClientProxy.h DBusClientProxy.cpp \
     CommLayerInner.h CommLayerInner.cpp \
-    DBusClientProxy.h \
-    CommLayerClientDBus.h CommLayerClientDBus.cpp
+    CommLayerClientDBus.h CommLayerClientDBus.cpp \
+    Observer.h \
+    DBusCommon.h
 libABRTCommLayer_la_LIBADD = \
     ../../lib/MiddleWare/libABRTMiddleWare.la \
     $(DL_LIBS) $(DBUSCPP_LIBS)
diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am
index 26658504..f0ec5ed2 100644
--- a/src/Applet/Makefile.am
+++ b/src/Applet/Makefile.am
@@ -1,13 +1,22 @@
 bin_PROGRAMS = abrt-applet
-abrt_applet_SOURCES = Applet.cpp  CCApplet.cpp  CCApplet.h
-abrt_applet_CPPFLAGS = -Wall -Werror -I../Daemon/ \
-                       -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
-                       -DBIN_DIR=\"$(bindir)\" \
-                       $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS)\
-                       -I$(srcdir)/../../inc -I../../lib/CommLayer \
-                       -I../../lib/MiddleWare -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
 
-abrt_applet_LDADD = $(DL_LIBS) $(GTK_LIBS) -lglib-2.0 -lgthread-2.0 $(DBUSCPP_LIBS) $(LIBNOTIFY_LIBS)
+abrt_applet_SOURCES = Applet.cpp CCApplet.cpp CCApplet.h
+abrt_applet_CPPFLAGS = \
+    -Wall -Werror \
+    -I../Daemon/ \
+    -I$(srcdir)/../../inc \
+    -I$(srcdir)/../../lib/CommLayer \
+    -I$(srcdir)/../../lib/MiddleWare \
+    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+    -DBIN_DIR=\"$(bindir)\" \
+    $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS) \
+    -I/usr/include/glib-2.0 \
+    -I/usr/lib/glib-2.0/include
+abrt_applet_LDADD = \
+    ../../lib/CommLayer/libABRTCommLayer.la \
+    $(DL_LIBS) $(GTK_LIBS) \
+    -lglib-2.0 -lgthread-2.0 \
+    $(DBUSCPP_LIBS) $(LIBNOTIFY_LIBS)
 
 EXTRA_DIST = abrt-applet.desktop