From 34f375526f44ff255d45bbabcd1425b3d5d0bb4a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Nov 2016 14:26:20 -0400 Subject: remove xmpp support I've long considered the XMPP support in git-annex a wart. It's nice to remove it. (This also removes the NetMessager, which was only used for XMPP, and the daemonstatus's desynced list (likewise).) Existing XMPP remotes should be ignored by git-annex. This commit was sponsored by Brock Spratlen on Patreon. --- Assistant.hs | 9 --------- 1 file changed, 9 deletions(-) (limited to 'Assistant.hs') diff --git a/Assistant.hs b/Assistant.hs index 4dab6f162..ea9967610 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -41,10 +41,6 @@ import Assistant.Threads.WebApp #ifdef WITH_PAIRING import Assistant.Threads.PairListener #endif -#ifdef WITH_XMPP -import Assistant.Threads.XMPPClient -import Assistant.Threads.XMPPPusher -#endif #else import Assistant.Types.UrlRenderer #endif @@ -153,11 +149,6 @@ startDaemon assistant foreground startdelay cannotrun listenhost startbrowser = #ifdef WITH_PAIRING , assist $ pairListenerThread urlrenderer #endif -#ifdef WITH_XMPP - , assist $ xmppClientThread urlrenderer - , assist $ xmppSendPackThread urlrenderer - , assist $ xmppReceivePackThread urlrenderer -#endif #endif , assist pushThread , assist pushRetryThread -- cgit v1.2.3