diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-26 19:42:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-26 19:42:24 -0400 |
| commit | 117df9c3714f2366d4f10d63fce41a608d96308e (patch) | |
| tree | 47155e8948b3137cf2ee527afe2984899a3685eb /Assistant/Threads/MountWatcher.hs | |
| parent | d2b9c300b12a025de66f39efafd7962dc591a330 (diff) | |
| parent | 26fb68355b4ad95f99b2d14110e683109d0bab3d (diff) | |
Merge branch 'master' into xmpp
Conflicts:
Assistant/Threads/NetWatcher.hs
Diffstat (limited to 'Assistant/Threads/MountWatcher.hs')
| -rw-r--r-- | Assistant/Threads/MountWatcher.hs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs index 881f9d8d6..afd1c223c 100644 --- a/Assistant/Threads/MountWatcher.hs +++ b/Assistant/Threads/MountWatcher.hs @@ -74,6 +74,11 @@ dbusThread st dstatus scanremotes pushnotifier = ) onerr :: E.SomeException -> IO () onerr e = do + {- If the session dbus fails, the user probably + - logged out of their desktop. Even if they log + - back in, we won't have access to the dbus + - session key, so polling is the best that can be + - done in this situation. -} runThreadState st $ warning $ "dbus failed; falling back to mtab polling (" ++ show e ++ ")" pollinstead |