From dc7e920c011ff78b95bbc48935d375b92294c462 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 7 Jun 2017 14:20:09 +0200
Subject: [PATCH] Fix sound during call pause that was not playing because the
 path was wrong.

---
 linphone-desktop/src/app/paths/Paths.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/linphone-desktop/src/app/paths/Paths.cpp b/linphone-desktop/src/app/paths/Paths.cpp
index c0ba9b486..48f832366 100644
--- a/linphone-desktop/src/app/paths/Paths.cpp
+++ b/linphone-desktop/src/app/paths/Paths.cpp
@@ -32,7 +32,7 @@
 
 #include "Paths.hpp"
 
-#define PATH_ASSISTANT_CONFIG "/assistant/"
+#define PATH_ASSISTANT_CONFIG "/linphone/assistant/"
 #define PATH_AVATARS "/avatars/"
 #define PATH_CAPTURES "/captures/"
 #define PATH_LOGS "/logs/"
@@ -41,8 +41,8 @@
 
 #define PATH_CALL_HISTORY_LIST "/call-history.db"
 #define PATH_CONFIG "/linphonerc"
-#define PATH_FACTORY_CONFIG "/linphonerc-factory"
-#define PATH_ROOT_CA "/rootca.pem"
+#define PATH_FACTORY_CONFIG "/linphone/linphonerc-factory"
+#define PATH_ROOT_CA "/linphone/rootca.pem"
 #define PATH_FRIENDS_LIST "/friends.db"
 #define PATH_MESSAGE_HISTORY_LIST "/message-history.db"
 #define PATH_ZRTP_SECRETS "/zidcache"
@@ -100,26 +100,24 @@ inline string getWritableFilePath (const QString &filename) {
 
 // -----------------------------------------------------------------------------
 
-inline QString getAppPackageDataDirPath () {
+inline QDir getAppPackageDir () {
   QDir dir(QCoreApplication::applicationDirPath());
   if (dir.dirName() == "MacOS") {
     dir.cdUp();
     dir.cd("Resources");
   } else
     dir.cdUp();
+  return dir;
+}
 
-  dir.cd("share/linphone");
+inline QString getAppPackageDataDirPath () {
+  QDir dir = getAppPackageDir();
+  dir.cd("share");
   return dir.absolutePath();
 }
 
 inline QString getAppPackageMsPluginsDirPath () {
-  QDir dir(QCoreApplication::applicationDirPath());
-  if (dir.dirName() == "MacOS") {
-    dir.cdUp();
-    dir.cd("Resources");
-  } else
-    dir.cdUp();
-
+  QDir dir = getAppPackageDir();
   dir.cd(MSPLUGINS_DIR);
   return dir.absolutePath();
 }