From d9ec86a69e2f369a47fafab4b4e0820f4ab4ad6c Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@gmail.com>
Date: Mon, 9 Feb 2015 19:58:10 -0500
Subject: [PATCH] Remove dead code
Refs #65917
Change-Id: I574b4096f4a7d7f3b665cad8557cc28982b7a7e1
---
daemon/configure.ac | 9 ---------
daemon/src/Makefile.am | 4 ----
daemon/src/managerimpl.cpp | 3 ---
3 files changed, 16 deletions(-)
diff --git a/daemon/configure.ac b/daemon/configure.ac
index 2dd38575ed..de3bf82e86 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -525,15 +525,6 @@ AS_IF([test "x$enable_dht" != "xno" -a "$HAVE_GNUTLS" -eq 1],
[AC_DEFINE([HAVE_DHT], 0, [Define to enable dht])
AM_CONDITIONAL(USE_DHT, false)])
-# NETWORK MANAGER
-# required dependency(ies): libiax2 (static)
-dnl Check for network-manager
-AC_ARG_WITH([networkmanager], [AS_HELP_STRING([--without-networkmanager],
- [disable support for network-manager events])], [],
- [with_networkmanager=yes])
-
-AM_CONDITIONAL(USE_NETWORKMANAGER, test "x$with_networkmanager" = "xyes" )
-
dnl IPv6 mode is default-disabled
AC_ARG_ENABLE([ipv6], AS_HELP_STRING([--enable-ipv6], [Enable IPv6 support]))
diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am
index cb9a23f615..1a7b319c3e 100644
--- a/daemon/src/Makefile.am
+++ b/daemon/src/Makefile.am
@@ -30,10 +30,6 @@ RINGACC_CXXFLAG=-DUSE_DHT
RINGACC_LIBA=./ringdht/libringacc.la
endif
-if USE_NETWORKMANAGER
-NETWORKMANAGER=-DUSE_NETWORKMANAGER
-endif
-
if BUILD_TLS
TLS_LIB = @GNUTLS_LIBS@
TLS_CFLAGS = @GNUTLS_CFLAGS@
diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
index 5857100532..0894b31010 100644
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@@ -164,9 +164,6 @@ ManagerImpl::ManagerImpl() :
presenceManager_(new PresenceManager)
#ifdef RING_VIDEO
, videoManager_(new VideoManager)
-#endif
-#ifdef USE_NETWORKMANAGER
- , networkManager_(0)
#endif
, currentCallMutex_(), dtmfKey_(), dtmfBuf_(0, AudioFormat::MONO()),
toneMutex_(), telephoneTone_(), audiofile_(), audioLayerMutex_(),
--
GitLab