diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-11-14 14:26:20 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-11-14 14:53:08 -0400 |
| commit | 34f375526f44ff255d45bbabcd1425b3d5d0bb4a (patch) | |
| tree | a78e27f5e125587828f30af3abef691b33baae88 /Assistant.hs | |
| parent | e7088c519678f63f460646cc19c3e25423da4f00 (diff) | |
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.
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 9 |
1 files changed, 0 insertions, 9 deletions
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 |