From 377bc4a2e022c243064abcccadeeeee10d267d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 30 Nov 2020 16:10:12 -0500
Subject: [PATCH] dring: remove deprecated API
Change-Id: Ieb61181e437278e1975fadfa9908c0bc413b1add
---
bin/dbus/cx.ring.Ring.CallManager.xml | 20 --------------------
bin/dbus/dbusclient.cpp | 4 ----
compat/msvc/config.h | 3 ---
src/client/ring_signal.cpp | 2 --
src/jami/callmanager_interface.h | 10 ----------
5 files changed, 39 deletions(-)
diff --git a/bin/dbus/cx.ring.Ring.CallManager.xml b/bin/dbus/cx.ring.Ring.CallManager.xml
index b4d611fb85..100e178c47 100644
--- a/bin/dbus/cx.ring.Ring.CallManager.xml
+++ b/bin/dbus/cx.ring.Ring.CallManager.xml
@@ -928,26 +928,6 @@
</tp:docstring>
</signal>
- <signal name="secureSdesOn" tp:name-for-bindings="secureSdesOn">
- <tp:added version="0.9.7"/>
- <tp:docstring>
- <p>Signal sent on SDES session success. Media transmission is encripted
- for this call only. It does not apply for a conference.</p>
- <p>A conference can be considered to be secured if and only if each
- participant is secured.</p>
- </tp:docstring>
- <arg type="s" name="callID"/>
- </signal>
-
- <signal name="secureSdesOff" tp:name-for-bindings="secureSdesOff">
- <tp:added version="0.9.7"/>
- <tp:docstring>
- <p>Signal sent to notify that SDES session failed.</p>
- <p>Media transmission is not encrypted.</p>
- </tp:docstring>
- <arg type="s" name="callID" />
- </signal>
-
<signal name="recordingStateChanged" tp:name-for-bindings="recordingStateChange">
<tp:added version="1.3.0"/>
<arg type="s" name="callID" />
diff --git a/bin/dbus/dbusclient.cpp b/bin/dbus/dbusclient.cpp
index 248585343f..2890d296b3 100644
--- a/bin/dbus/dbusclient.cpp
+++ b/bin/dbus/dbusclient.cpp
@@ -185,10 +185,6 @@ DBusClient::initLibrary(int flags)
bind(&DBusCallManager::conferenceRemoved, callM, _1)),
exportable_callback<CallSignal::RecordingStateChanged>(
bind(&DBusCallManager::recordingStateChanged, callM, _1, _2)),
- exportable_callback<CallSignal::SecureSdesOn>(
- bind(&DBusCallManager::secureSdesOn, callM, _1)),
- exportable_callback<CallSignal::SecureSdesOff>(
- bind(&DBusCallManager::secureSdesOff, callM, _1)),
exportable_callback<CallSignal::RtcpReportReceived>(
bind(&DBusCallManager::onRtcpReportReceived, callM, _1, _2)),
exportable_callback<CallSignal::OnConferenceInfosUpdated>(
diff --git a/compat/msvc/config.h b/compat/msvc/config.h
index 186b550675..fafffeb72a 100644
--- a/compat/msvc/config.h
+++ b/compat/msvc/config.h
@@ -88,9 +88,6 @@ systems. This function is required for `alloca.c' support on those systems.
/* Define if you have pulseaudio */
#define HAVE_PULSE 0
-/* Define if you have sdes support */
-#define HAVE_SDES 1
-
/* Define if you have shared memory support */
#define HAVE_SHM 0
diff --git a/src/client/ring_signal.cpp b/src/client/ring_signal.cpp
index dcccdedbd7..1d53db2af2 100644
--- a/src/client/ring_signal.cpp
+++ b/src/client/ring_signal.cpp
@@ -42,8 +42,6 @@ getSignalHandlers()
exported_callback<DRing::CallSignal::UpdatePlaybackScale>(),
exported_callback<DRing::CallSignal::ConferenceRemoved>(),
exported_callback<DRing::CallSignal::RecordingStateChanged>(),
- exported_callback<DRing::CallSignal::SecureSdesOn>(),
- exported_callback<DRing::CallSignal::SecureSdesOff>(),
exported_callback<DRing::CallSignal::RtcpReportReceived>(),
exported_callback<DRing::CallSignal::PeerHold>(),
exported_callback<DRing::CallSignal::VideoMuted>(),
diff --git a/src/jami/callmanager_interface.h b/src/jami/callmanager_interface.h
index 24f306de8a..944b4d43be 100644
--- a/src/jami/callmanager_interface.h
+++ b/src/jami/callmanager_interface.h
@@ -212,16 +212,6 @@ struct DRING_PUBLIC CallSignal
constexpr static const char* name = "RecordingStateChanged";
using cb_type = void(const std::string&, int);
};
- struct DRING_PUBLIC SecureSdesOn
- {
- constexpr static const char* name = "SecureSdesOn";
- using cb_type = void(const std::string&);
- };
- struct DRING_PUBLIC SecureSdesOff
- {
- constexpr static const char* name = "SecureSdesOff";
- using cb_type = void(const std::string&);
- };
struct DRING_PUBLIC RtcpReportReceived
{
constexpr static const char* name = "RtcpReportReceived";
--
GitLab