From 0e2744828e7eaa042cb78095fd48b5057ea2c30a Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Date: Wed, 28 Jan 2015 20:09:31 +0000
Subject: [PATCH] Change header name based on upstream changes

Refs #64866
---
 CMakeLists.txt                            |  3 +++
 cmake/FindRing.cmake                      | 10 +++++-----
 src/certificate.cpp                       |  2 +-
 src/qtwrapper/callmanager_wrap.h          |  2 +-
 src/qtwrapper/configurationmanager_wrap.h |  2 +-
 src/qtwrapper/instancemanager_wrap.h      |  4 ++--
 src/qtwrapper/presencemanager_wrap.h      |  2 +-
 src/qtwrapper/videomanager_wrap.h         |  2 +-
 8 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09c5b219..ab8c9bb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,9 @@ IF(${ENABLE_LIBWRAP} MATCHES true)
    MESSAGE("Compiling for OS X: LibWrap enabled, Qt5 enabled.")
 
    INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/qtwrapper/)
+ENDIF()
+
+IF (${RING_FOUND} MATCHES "true")
    INCLUDE_DIRECTORIES(${ring_INCLUDE_DIRS})
 ENDIF()
 
diff --git a/cmake/FindRing.cmake b/cmake/FindRing.cmake
index 6747889f..703a8336 100644
--- a/cmake/FindRing.cmake
+++ b/cmake/FindRing.cmake
@@ -4,10 +4,10 @@
 
 SET(RING_FOUND true)
 
-IF(EXISTS ${RING_BUILD_DIR}/public/ring.h)
-   SET(ring_INCLUDE_DIRS ${RING_BUILD_DIR}/public)
-ELSEIF(EXISTS ${CMAKE_INSTALL_PREFIX}/include/ring.h)
-   SET(ring_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)
+IF(EXISTS ${RING_BUILD_DIR}/dring/dring.h)
+   SET(ring_INCLUDE_DIRS ${RING_BUILD_DIR}/dring)
+ELSEIF(EXISTS ${CMAKE_INSTALL_PREFIX}/include/dring/dring.h)
+   SET(ring_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/dring)
 ELSE()
    MESSAGE("Daemon header not found!
    Add -DRING_BUILD_DIR or -DCMAKE_INSTALL_PREFIX")
@@ -20,5 +20,5 @@ FIND_LIBRARY(ring_BIN NAMES ring
              PATHS ${RING_BUILD_DIR}/.libs 
              PATHS ${CMAKE_INSTALL_PREFIX}/libexec )
 
-MESSAGE("Ring daemon header is " ${ring_INCLUDE_DIRS}/ring.h)
+MESSAGE("Ring daemon header is " ${ring_INCLUDE_DIRS}/dring.h)
 MESSAGE("Ring library path is " ${ring_BIN})
diff --git a/src/certificate.cpp b/src/certificate.cpp
index ecebf746..e32757a5 100644
--- a/src/certificate.cpp
+++ b/src/certificate.cpp
@@ -19,7 +19,7 @@
 
 #include <QtCore/QFile>
 #include "dbus/configurationmanager.h"
-#include "/home/lepagee/dev/sflphone_review/daemon/src/dring/security.h"
+#include <security.h>
 
 class CertificateDetailsCache {
 public:
diff --git a/src/qtwrapper/callmanager_wrap.h b/src/qtwrapper/callmanager_wrap.h
index c48d5109..fd3aa955 100644
--- a/src/qtwrapper/callmanager_wrap.h
+++ b/src/qtwrapper/callmanager_wrap.h
@@ -27,7 +27,7 @@
 #include <QtCore/QVariant>
 #include <QtCore/QTimer>
 
-#include <ring.h>
+#include <dring.h>
 #include "../dbus/metatypes.h"
 #include "conversions_wrap.hpp"
 
diff --git a/src/qtwrapper/configurationmanager_wrap.h b/src/qtwrapper/configurationmanager_wrap.h
index 574e01d2..0cfb73f1 100644
--- a/src/qtwrapper/configurationmanager_wrap.h
+++ b/src/qtwrapper/configurationmanager_wrap.h
@@ -29,7 +29,7 @@
 
 #include <future>
 
-#include <ring.h>
+#include <dring.h>
 #include "../dbus/metatypes.h"
 #include "conversions_wrap.hpp"
 
diff --git a/src/qtwrapper/instancemanager_wrap.h b/src/qtwrapper/instancemanager_wrap.h
index c9621e44..2defef3e 100644
--- a/src/qtwrapper/instancemanager_wrap.h
+++ b/src/qtwrapper/instancemanager_wrap.h
@@ -27,7 +27,7 @@
 #include <QVariant>
 #include <QTimer>
 
-#include "ring.h"
+#include "dring.h"
 #include "../dbus/metatypes.h"
 #include "conversions_wrap.hpp"
 
@@ -42,7 +42,7 @@ public:
 
    ~InstanceInterface();
 
-// TODO: These are not present in ring.h
+// TODO: These are not present in dring.h
 
 public Q_SLOTS: // METHODS
    void Register(int pid, const QString &name)
diff --git a/src/qtwrapper/presencemanager_wrap.h b/src/qtwrapper/presencemanager_wrap.h
index 74196824..f95fc321 100644
--- a/src/qtwrapper/presencemanager_wrap.h
+++ b/src/qtwrapper/presencemanager_wrap.h
@@ -27,7 +27,7 @@
 #include <QtCore/QVariant>
 #include <QtCore/QTimer>
 
-#include <ring.h>
+#include <dring.h>
 
 #include "../dbus/metatypes.h"
 #include "conversions_wrap.hpp"
diff --git a/src/qtwrapper/videomanager_wrap.h b/src/qtwrapper/videomanager_wrap.h
index efef4dfc..4006600d 100644
--- a/src/qtwrapper/videomanager_wrap.h
+++ b/src/qtwrapper/videomanager_wrap.h
@@ -26,7 +26,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 
-#include <ring.h>
+#include <dring.h>
 #include "../dbus/metatypes.h"
 #include "conversions_wrap.hpp"
 
-- 
GitLab