diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-28 12:26:16 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-28 12:26:16 -0400 |
| commit | 900c29071ad6b342be4eea00439fc355503ecbd2 (patch) | |
| tree | d35adcadd1f063f1ae5b7205e82b845f18c8dd5f /Assistant.hs | |
| parent | 7a15547943bf87131b13804c9337eec59f9b9350 (diff) | |
| parent | 68f5d56115c2e4011b9a9be7c2585c1fe43f4957 (diff) | |
Merge branch 'no-xmpp'
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 |