From ac11026595ccd2bb44514b2b023b1e54781dc84e Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 4 Jul 2013 14:09:39 -0400
Subject: [PATCH] * #25537: daemon: move dbusmanager.* to client.*

---
 daemon/src/audio/audiortp/zrtp_session_callback.cpp | 2 +-
 daemon/src/dbus/Makefile.am                         | 4 ++--
 daemon/src/dbus/{dbusmanager.cpp => client.cpp}     | 2 +-
 daemon/src/dbus/{dbusmanager.h => client.h}         | 0
 daemon/src/managerimpl.h                            | 2 +-
 daemon/src/sip/siptransport.cpp                     | 2 +-
 daemon/src/sip/sipvoiplink.cpp                      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename daemon/src/dbus/{dbusmanager.cpp => client.cpp} (99%)
 rename daemon/src/dbus/{dbusmanager.h => client.h} (100%)

diff --git a/daemon/src/audio/audiortp/zrtp_session_callback.cpp b/daemon/src/audio/audiortp/zrtp_session_callback.cpp
index 5f2c8fce8..588cd9379 100644
--- a/daemon/src/audio/audiortp/zrtp_session_callback.cpp
+++ b/daemon/src/audio/audiortp/zrtp_session_callback.cpp
@@ -30,7 +30,7 @@
 #include "zrtp_session_callback.h"
 #include "logger.h"
 #include "sip/sipcall.h"
-#include "dbus/dbusmanager.h"
+#include "dbus/client.h"
 #include "dbus/callmanager.h"
 #include "manager.h"
 
diff --git a/daemon/src/dbus/Makefile.am b/daemon/src/dbus/Makefile.am
index 288f7287a..07f7abe33 100644
--- a/daemon/src/dbus/Makefile.am
+++ b/daemon/src/dbus/Makefile.am
@@ -29,7 +29,7 @@ libdbus_la_SOURCES = \
     callmanager.cpp \
     configurationmanager.cpp  \
     instance.cpp  \
-    dbusmanager.cpp
+    client.cpp
 
 if SFL_VIDEO
 libdbus_la_SOURCES+=video_controls.cpp
@@ -52,7 +52,7 @@ noinst_HEADERS =            \
     callmanager.h           \
     configurationmanager.h  \
     instance.h              \
-    dbusmanager.h           \
+    client.h                \
     networkmanager_proxy.h  \
     networkmanager.h        \
     dbus_cpp.h        		\
diff --git a/daemon/src/dbus/dbusmanager.cpp b/daemon/src/dbus/client.cpp
similarity index 99%
rename from daemon/src/dbus/dbusmanager.cpp
rename to daemon/src/dbus/client.cpp
index bac5607eb..0aec5f5c3 100644
--- a/daemon/src/dbus/dbusmanager.cpp
+++ b/daemon/src/dbus/client.cpp
@@ -33,7 +33,7 @@
 #endif
 
 #include <cstdlib>
-#include "dbusmanager.h"
+#include "client.h"
 #include "global.h"
 #include "manager.h"
 #include "logger.h"
diff --git a/daemon/src/dbus/dbusmanager.h b/daemon/src/dbus/client.h
similarity index 100%
rename from daemon/src/dbus/dbusmanager.h
rename to daemon/src/dbus/client.h
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index 3dc63fa93..52cf076b1 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -46,7 +46,7 @@
 #include <tr1/memory>
 
 #include <pthread.h>
-#include "dbus/dbusmanager.h"
+#include "dbus/client.h"
 
 #include "config/sfl_config.h"
 
diff --git a/daemon/src/sip/siptransport.cpp b/daemon/src/sip/siptransport.cpp
index 81cc5cb17..fa98f30a3 100644
--- a/daemon/src/sip/siptransport.cpp
+++ b/daemon/src/sip/siptransport.cpp
@@ -59,7 +59,7 @@
 #include "pjsip/sip_transport_tls.h"
 #endif
 
-#include "dbus/dbusmanager.h"
+#include "dbus/client.h"
 #include "dbus/configurationmanager.h"
 
 static const char * const DEFAULT_INTERFACE = "default";
diff --git a/daemon/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp
index 79ad7f689..ed4b2af2c 100644
--- a/daemon/src/sip/sipvoiplink.cpp
+++ b/daemon/src/sip/sipvoiplink.cpp
@@ -52,7 +52,7 @@
 #endif
 #include "array_size.h"
 
-#include "dbus/dbusmanager.h"
+#include "dbus/client.h"
 #include "dbus/callmanager.h"
 #include "dbus/configurationmanager.h"