mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-22 22:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(Assistant): rename linphone files to app files

Browse source
This commit is contained in:
Ronan Abhamon 2018-07-19 09:36:48 +02:00
parent 53b1c89abc
commit 92134af645
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -455,10 +455,10 @@ set(ASSISTANT_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/${EXECUTABLE_NAME}/assis
install(FILES "${ASSETS_ASSISTANT_DIR}/use-other-sip-account.rc"
DESTINATION "${ASSISTANT_INSTALL_DATADIR}"
)
install(FILES "${ASSETS_ASSISTANT_DIR}/create-linphone-sip-account.rc"
install(FILES "${ASSETS_ASSISTANT_DIR}/create-app-sip-account.rc"
DESTINATION "${ASSISTANT_INSTALL_DATADIR}"
)
install(FILES "${ASSETS_ASSISTANT_DIR}/use-linphone-sip-account.rc"
install(FILES "${ASSETS_ASSISTANT_DIR}/use-app-sip-account.rc"
DESTINATION "${ASSISTANT_INSTALL_DATADIR}"
)

0
assets/assistant/create-linphone-sip-account.rc → assets/assistant/create-app-sip-account.rc
View file

0
assets/assistant/use-linphone-sip-account.rc → assets/assistant/use-app-sip-account.rc
View file

4
cmake_builder/linphone_package/CMakeLists.txt
View file

@ -212,8 +212,8 @@ elseif (APPLE)
file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/linphonerc-factory" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}")
file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/use-other-sip-account.rc" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}/assistant")
file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/create-linphone-sip-account.rc" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}/assistant")
file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/use-linphone-sip-account.rc" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}/assistant")
file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/create-app-sip-account.rc" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}/assistant")
file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/use-app-sip-account.rc" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}/assistant")
file(GLOB SHARED_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME}.app/Contents/Frameworks/lib*.dylib")
foreach (_library ${SHARED_LIBRARIES})

2
src/components/settings/AccountSettingsModel.cpp
View file

@ -221,7 +221,7 @@ shared_ptr<linphone::ProxyConfig> AccountSettingsModel::createProxyConfig () {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
core->getConfig()->loadFromXmlFile(
Paths::getAssistantConfigDirPath() + "create-linphone-sip-account.rc"
Paths::getAssistantConfigDirPath() + "create-app-sip-account.rc"
);
return core->createProxyConfig();

2
ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml
View file

@ -116,7 +116,7 @@ AssistantAbstractView {
: ''
}
configFilename: 'create-linphone-sip-account.rc'
configFilename: 'create-app-sip-account.rc'
onEmailChanged: emailError = error
onPasswordChanged: passwordError = error

2
ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml
View file

@ -108,7 +108,7 @@ AssistantAbstractView {
AssistantModel {
id: assistantModel
configFilename: 'create-linphone-sip-account.rc'
configFilename: 'create-app-sip-account.rc'
Component.onCompleted: view.setCountryCode(country.model.defaultIndex)

2
ui/views/App/Main/Assistant/UseAppSipAccount.qml
View file

@ -68,7 +68,7 @@ AssistantAbstractView {
assistantModel.countryCode = model.data(model.index(index, 0)).countryCode
}
configFilename: 'use-linphone-sip-account.rc'
configFilename: 'use-app-sip-account.rc'
countryCode: setCountryCode(telephoneNumbersModel.defaultIndex)