From 1163688f785594bdeb7eecff48759e46ba27f313 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 8 Nov 2021 21:03:27 +0100 Subject: [PATCH] Allow unsetting APPLICATION_URL and APPLICATION_VENDOR from configure --- linphone-app/src/app/App.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp index 1f3ea0807..06a888b3a 100644 --- a/linphone-app/src/app/App.cpp +++ b/linphone-app/src/app/App.cpp @@ -373,8 +373,18 @@ void App::initContentApp () { mEngine->addImageProvider(ThumbnailProvider::ProviderId, new ThumbnailProvider()); mEngine->rootContext()->setContextProperty("applicationName", APPLICATION_NAME); + +#ifdef APPLICATION_URL mEngine->rootContext()->setContextProperty("applicationUrl", APPLICATION_URL); +#else + mEngine->rootContext()->setContextProperty("applicationUrl", ""); +#endif + +#ifdef APPLICATION_VENDOR mEngine->rootContext()->setContextProperty("applicationVendor", APPLICATION_VENDOR); +#else + mEngine->rootContext()->setContextProperty("applicationVendor", ""); +#endif #ifdef APPLICATION_LICENCE mEngine->rootContext()->setContextProperty("applicationLicence", APPLICATION_LICENCE); #else @@ -863,7 +873,7 @@ void App::setAutoStart (bool enabled) { "Exec=" + exec + " --iconified\n" "Terminal=false\n" "Categories=Network;Telephony;\n" - "MimeType=x-scheme-handler/sip-linphone;x-scheme-handler/sip;x-scheme-handler/sips-linphone;x-scheme-handler/sips;x-scheme-handler/tel;x-scheme-handler/callto;\n" + "MimeType=x-scheme-handler/sip-" EXECUTABLE_NAME ";x-scheme-handler/sip;x-scheme-handler/sips-" EXECUTABLE_NAME ";x-scheme-handler/sips;x-scheme-handler/tel;x-scheme-handler/callto;\n" ); mAutoStart = enabled;