Code smell, packaging: do not include $${LRC}/src

If somebody install libringclient, it will be /usr/include/libringclient/ not /usr/include/libringclient/src so the build will fails. $${LRC} will link to the installed lrc anyway

Same for /build, as it will be /usr/lib

changed the description

Here are all of the changes I needed to make in order to compile and run jami-client-qt on Linux:

• #229 (closed) (remove #include "../daemon/src/dring/account_const.h" from accountadapter.cpp
• This issue, #230 (closed) (replace $${LRC}/src with $${LRC} and replace $${LRC}/build with $${LRC} in jami-qt.pro
• #233 (closed): in resources.qrc replace ../lrc/src/ with /usr/include/libringclient/ (but maybe should be a variable like $${LRC}, I don't know)
• also in resources.qrc: replace chatview-windows.css with chatview-gnome.css (maybe a chatview-qt file should just be created)
• The following additional changes in accountadapter.cpp:

@@ -131,10 +130,8 @@ AccountAdapter::createJamiAccount(QString registeredName,
 
     QtConcurrent::run([settings] {
         QMap<QString, QString> additionalAccountConfig;
-        additionalAccountConfig.insert(DRing::Account::ConfProperties::Ringtone::PATH,
-                                       Utils::GetRingtonePath());
-        additionalAccountConfig.insert(DRing::Account::ConfProperties::ISRENDEZVOUS,
-                                       settings["isRendezVous"].toString());
+	additionalAccountConfig.insert("Account.ringtonePath", Utils::GetRingtonePath());
+	additionalAccountConfig.insert("Account.rendezVous", settings["isRendezVous"].toString());
 
         LRCInstance::accountModel().createNewAccount(lrc::api::profile::Type::RING,
                                                      settings["alias"].toString(),
@@ -172,8 +169,7 @@ AccountAdapter::createSIPAccount(const QVariantMap& settings)
 
     QtConcurrent::run([settings] {
         QMap<QString, QString> additionalAccountConfig;
-        additionalAccountConfig.insert(DRing::Account::ConfProperties::Ringtone::PATH,
-                                       Utils::GetRingtonePath());
+	additionalAccountConfig.insert("Account.ringtonePath", Utils::GetRingtonePath());
 
         LRCInstance::accountModel().createNewAccount(lrc::api::profile::Type::SIP,
                                                      settings["alias"].toString(),
@@ -205,8 +201,7 @@ AccountAdapter::createJAMSAccount(const QVariantMap& settings)
 
     QtConcurrent::run([settings] {
         QMap<QString, QString> additionalAccountConfig;
-        additionalAccountConfig.insert(DRing::Account::ConfProperties::Ringtone::PATH,
-                                       Utils::GetRingtonePath());
+	additionalAccountConfig.insert("Account.ringtonePath", Utils::GetRingtonePath());
 
         LRCInstance::accountModel().connectToAccountManager(settings["username"].toString(),
                                                             settings["password"].toString(),

• replace double quotes with <> in lrcinstance.h:

@@ -30,7 +30,7 @@
 #include "appsettingsmanager.h"
 #include "utils.h"
 
-#include "api/account.h"
+#include <api/account.h>

• add an include for api/chatview.h in messagesadapter.cpp

Here is everything in a patch but like I said you will probably make more changes to at least resources.qrc.

@sblin Just a question,

for client-qt we still need to use chatview-windows.css, is that right?

yes I think it can be replaced by chatview-qt.css

ok

cc @mzhang @ababi

I will talk with @ababi when he comes back, not too familiar with his changes

assigned to @ababi

changed milestone to %Iteration 26

changed milestone to %Iteration 27

mentioned in issue #263 (closed)

added SprintTo review label

closed

removed SprintTo review label

mentioned in commit 69db8684