From 13483daa13d1b366fa9c7222361c094d3726f03e Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 14 Sep 2009 14:57:55 +0200
Subject: move lib/CommLayer/CommLayerClientDBus.{h,cpp) -> src/CLI

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 lib/CommLayer/CommLayerClientDBus.cpp | 14 --------------
 lib/CommLayer/CommLayerClientDBus.h   | 17 -----------------
 lib/CommLayer/Makefile.am             |  1 -
 src/Applet/CCApplet.h                 |  2 +-
 src/Applet/Makefile.am                |  4 +++-
 src/CLI/CommLayerClientDBus.cpp       | 14 ++++++++++++++
 src/CLI/CommLayerClientDBus.h         | 17 +++++++++++++++++
 src/CLI/Makefile.am                   | 18 +++++++++++-------
 8 files changed, 46 insertions(+), 41 deletions(-)
 delete mode 100644 lib/CommLayer/CommLayerClientDBus.cpp
 delete mode 100644 lib/CommLayer/CommLayerClientDBus.h
 create mode 100644 src/CLI/CommLayerClientDBus.cpp
 create mode 100644 src/CLI/CommLayerClientDBus.h

diff --git a/lib/CommLayer/CommLayerClientDBus.cpp b/lib/CommLayer/CommLayerClientDBus.cpp
deleted file mode 100644
index 7798346..0000000
--- a/lib/CommLayer/CommLayerClientDBus.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "CommLayerClientDBus.h"
-CCommLayerClientDBus::CCommLayerClientDBus(DBus::Connection &connection, const char *path, const char *name)
-: CDBusClient_proxy(connection),
-  DBus::ObjectProxy(connection, path, name)
-{
-}
-CCommLayerClientDBus::~CCommLayerClientDBus()
-{
-};
-
-void Crash(std::string &value)
-{
-    std::cout << "Another Crash?" << std::endl;
-}
diff --git a/lib/CommLayer/CommLayerClientDBus.h b/lib/CommLayer/CommLayerClientDBus.h
deleted file mode 100644
index 9e63f58..0000000
--- a/lib/CommLayer/CommLayerClientDBus.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <DBusCommon.h>
-#include <DBusClientProxy.h>
-#include <iostream>
-
-class CCommLayerClientDBus
-: public CDBusClient_proxy,
-  public DBus::IntrospectableProxy,
-  public DBus::ObjectProxy
-{
-    public:
-        CCommLayerClientDBus(DBus::Connection &connection, const char *path, const char *name);
-        ~CCommLayerClientDBus();
-        void Crash(std::string &value)
-        {
-            std::cout << "Another Crash?" << std::endl;
-        }
-};
diff --git a/lib/CommLayer/Makefile.am b/lib/CommLayer/Makefile.am
index 74b3aa5..be0c52b 100644
--- a/lib/CommLayer/Makefile.am
+++ b/lib/CommLayer/Makefile.am
@@ -3,7 +3,6 @@ lib_LTLIBRARIES = libABRTCommLayer.la
 libABRTCommLayer_la_SOURCES = \
     DBusClientProxy.h DBusClientProxy.cpp \
     CommLayerInner.h CommLayerInner.cpp \
-    CommLayerClientDBus.h CommLayerClientDBus.cpp \
     Observer.h \
     DBusCommon.h
 libABRTCommLayer_la_LIBADD = \
diff --git a/src/Applet/CCApplet.h b/src/Applet/CCApplet.h
index dccd70b..90a79e2 100644
--- a/src/Applet/CCApplet.h
+++ b/src/Applet/CCApplet.h
@@ -24,7 +24,7 @@
 #include <map>
 #include <string>
 #include <DBusClientProxy.h>
-#include<libnotify/notify.h>
+#include <libnotify/notify.h>
 
 class CApplet
 : public CDBusClient_proxy,
diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am
index 886102f..5190649 100644
--- a/src/Applet/Makefile.am
+++ b/src/Applet/Makefile.am
@@ -1,6 +1,8 @@
 bin_PROGRAMS = abrt-applet
 
-abrt_applet_SOURCES = Applet.cpp CCApplet.cpp CCApplet.h
+abrt_applet_SOURCES = \
+    Applet.cpp \
+    CCApplet.h CCApplet.cpp
 abrt_applet_CPPFLAGS = \
     -Wall -Werror \
     -I../Daemon/ \
diff --git a/src/CLI/CommLayerClientDBus.cpp b/src/CLI/CommLayerClientDBus.cpp
new file mode 100644
index 0000000..7798346
--- /dev/null
+++ b/src/CLI/CommLayerClientDBus.cpp
@@ -0,0 +1,14 @@
+#include "CommLayerClientDBus.h"
+CCommLayerClientDBus::CCommLayerClientDBus(DBus::Connection &connection, const char *path, const char *name)
+: CDBusClient_proxy(connection),
+  DBus::ObjectProxy(connection, path, name)
+{
+}
+CCommLayerClientDBus::~CCommLayerClientDBus()
+{
+};
+
+void Crash(std::string &value)
+{
+    std::cout << "Another Crash?" << std::endl;
+}
diff --git a/src/CLI/CommLayerClientDBus.h b/src/CLI/CommLayerClientDBus.h
new file mode 100644
index 0000000..9e63f58
--- /dev/null
+++ b/src/CLI/CommLayerClientDBus.h
@@ -0,0 +1,17 @@
+#include <DBusCommon.h>
+#include <DBusClientProxy.h>
+#include <iostream>
+
+class CCommLayerClientDBus
+: public CDBusClient_proxy,
+  public DBus::IntrospectableProxy,
+  public DBus::ObjectProxy
+{
+    public:
+        CCommLayerClientDBus(DBus::Connection &connection, const char *path, const char *name);
+        ~CCommLayerClientDBus();
+        void Crash(std::string &value)
+        {
+            std::cout << "Another Crash?" << std::endl;
+        }
+};
diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am
index 6900bda..33daaae 100644
--- a/src/CLI/Makefile.am
+++ b/src/CLI/Makefile.am
@@ -3,11 +3,15 @@
 #abrt_cli_CPPFLAGS = -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\"
 
 bin_PROGRAMS = abrt-cli
-abrt_cli_SOURCES = CLI.cpp ABRTSocket.cpp ABRTSocket.h
-abrt_cli_CPPFLAGS = $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS)\
-                    -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\" \
-                    -I$(srcdir)/../../lib/CommLayer \
-                    $(ENABLE_SOCKET_OR_DBUS) \
-                    -I../../lib/MiddleWare
+abrt_cli_SOURCES = \
+    CLI.cpp \
+    ABRTSocket.h ABRTSocket.cpp \
+    CommLayerClientDBus.h CommLayerClientDBus.cpp \
+abrt_cli_CPPFLAGS = \
+    $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS)\
+    -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\" \
+    -I$(srcdir)/../../lib/CommLayer \
+    $(ENABLE_SOCKET_OR_DBUS) \
+    -I../../lib/MiddleWare
 
-abrt_cli_LDADD = ../../lib/CommLayer/libABRTCommLayer.la
\ No newline at end of file
+abrt_cli_LDADD = ../../lib/CommLayer/libABRTCommLayer.la
-- 
cgit