diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-03 17:34:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-03 17:46:22 -0400 |
| commit | bc94dde8f6c5d7ca213fa81a6c03a4c9e22e16d5 (patch) | |
| tree | 9a5384d53b222577004ce2cbe8b1540a5e3f2e90 /Assistant.hs | |
| parent | efa88a0f1589a82a91a06ed3a3cbd5f4106aabb4 (diff) | |
XMPP pair requests are now received, and an alert displayed
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Assistant.hs b/Assistant.hs index a58015c37..5cc9f303f 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -136,15 +136,15 @@ import Assistant.Threads.NetWatcher import Assistant.Threads.TransferScanner import Assistant.Threads.TransferPoller import Assistant.Threads.ConfigMonitor -#ifdef WITH_XMPP -import Assistant.Threads.XMPPClient -#endif #ifdef WITH_WEBAPP import Assistant.WebApp import Assistant.Threads.WebApp #ifdef WITH_PAIRING import Assistant.Threads.PairListener #endif +#ifdef WITH_XMPP +import Assistant.Threads.XMPPClient +#endif #else #warning Building without the webapp. You probably need to install Yesod.. #endif @@ -191,6 +191,9 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do #ifdef WITH_PAIRING , assist $ pairListenerThread urlrenderer #endif +#ifdef WITH_XMPP + , assist $ xmppClientThread urlrenderer +#endif #endif , assist $ pushThread , assist $ pushRetryThread @@ -205,9 +208,6 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do , assist $ netWatcherFallbackThread , assist $ transferScannerThread , assist $ configMonitorThread -#ifdef WITH_XMPP - , assist $ xmppClientThread -#endif , watch $ watchThread ] liftIO waitForTermination |