mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-08-15 04:05:39 +02:00
e0b3b4adec
This is libjamiclient from the jami-libclient.git repository as of 767c45b8b09806ac05cbada720864df93588c047, with the following changes: * src/libclient/newaccountmodel.cpp: (NewAccountModelPimpl::removeFromAccounts): The lock wait inside '#ifdef CHK_FREEABLE_BEFORE_ERASE_ACCOUNT' was not updated when the type of 'accounts' was changed over the years from this: std::map<std::string, account::Info> to this: std::map<QString, std::pair<account::Info, std::shared_ptr<Database>>> Basically we need to get the 'first' of the pair for 'account::Info'. So we now do that. * src/libclient/avmodel.cpp: * src/libclient/callbackshandler.cpp: * src/libclient/contactmodel.cpp: * src/libclient/conversationmodel.cpp: * src/libclient/database.cpp: * src/libclient/namedirectory.cpp: * src/libclient/newaccountmodel.cpp: * src/libclient/newcallmodel.cpp: * src/libclient/newdevicemodel.cpp: * src/libclient/peerdiscoverymodel.cpp: * src/libclient/pluginmodel.cpp: * src/libclient/smartinfohub.cpp: * src/libclient/vcard.h: * src/libclient/authority/storagehelper.cpp: Replace Qt's 'foreach' with 'Q_FOREACH' and its 'emit' with 'Q_EMIT' because in the client-qt code base we have '-DQT_NO_KEYWORDS' to avoid conflicts with other libraries we use. * cmake/FindLibJami.cmake: Import cmake/FindRing.cmake from the jami-libclient.git repository. Then, rename RING_BUILD_DIR to LIBJAMI_BUILD_DIR (though the old name is still supported for now). Also update other references of Ring to Jami. Further, add additional calls to 'find_library' to make sure specified local paths for libjami are checked before system-wide ones (in case of older/obsolete libjami being available system-wide, which might happen on GNU/Linux systems). * translations/lrc_*.ts: Import translation files from the libclient repository. The message location paths were corrected by running "sed -i 's|../src|&/libclient|g' lrc_*.ts" in 'translations/'. .tx/config: Add section for the newly-imported libclient translations. * CMakeLists.txt: Reformat, plus various fixes and cleanups, such as changing indentation to 2 spaces and wrapping lines at 70 characters, renaming the parent directory of translations from 'ring' to 'jami', and using all lowercase function calls. Also add copyright headers. * src/app/appsettingsmanager.cpp: (AppSettingsManager::loadTranslations): * src/app/utilsadapter.cpp (UtilsAdapter::supportedLang): Update to adapt to the renaming of the parent directory of translations from 'ring' to 'jami'. GitLab: #748 Change-Id: I86e3b0fb30e554755023e7b858b6a0d132cd59ab
48 lines
2.3 KiB
C++
48 lines
2.3 KiB
C++
/****************************************************************************
|
|
* Copyright (C) 2009-2022 Savoir-faire Linux Inc. *
|
|
* Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com> *
|
|
* Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
|
|
* *
|
|
* This library is free software; you can redistribute it and/or *
|
|
* modify it under the terms of the GNU Lesser General Public *
|
|
* License as published by the Free Software Foundation; either *
|
|
* version 2.1 of the License, or (at your option) any later version. *
|
|
* *
|
|
* This library is distributed in the hope that it will be useful, *
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
|
|
* Lesser General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
***************************************************************************/
|
|
#include "callmanager.h"
|
|
|
|
#include "../globalinstances.h"
|
|
#include "../interfaces/dbuserrorhandleri.h"
|
|
|
|
CallManagerInterface&
|
|
CallManager::instance()
|
|
{
|
|
#ifdef ENABLE_LIBWRAP
|
|
static auto interface = new CallManagerInterface();
|
|
#else
|
|
if (!dbus_metaTypeInit)
|
|
registerCommTypes();
|
|
|
|
static auto interface = new CallManagerInterface("cx.ring.Ring",
|
|
"/cx/ring/Ring/CallManager",
|
|
QDBusConnection::sessionBus());
|
|
|
|
if (!interface->connection().isConnected()) {
|
|
GlobalInstances::dBusErrorHandler().connectionError(
|
|
"Error : jamid not connected. Service " + interface->service()
|
|
+ " not connected. From call manager interface.");
|
|
}
|
|
if (!interface->isValid()) {
|
|
GlobalInstances::dBusErrorHandler().invalidInterfaceError(
|
|
"Error : jamid is not available, make sure it is running");
|
|
}
|
|
#endif
|
|
return *interface;
|
|
}
|