summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-09-06 11:19:21 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-09-06 11:19:21 +0200
commit2667fa042934116d06a828767860964f52363943 (patch)
tree0a93631d9b33a54f7317ae5a472512595b18e5ea
parent80e392f2253fd9624b7a3862c6faeaf698905118 (diff)
parenta5fb89bad8b6fc7498cb7056faea1fdaa44de986 (diff)
downloadtelepathy-mission-control-2667fa042934116d06a828767860964f52363943.tar.gz
Merge branch 'telepathy-mission-control-5.12'
-rw-r--r--src/connectivity-monitor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/connectivity-monitor.c b/src/connectivity-monitor.c
index 27ae0690..5e6e425b 100644
--- a/src/connectivity-monitor.c
+++ b/src/connectivity-monitor.c
@@ -465,7 +465,7 @@ mcd_connectivity_monitor_is_online (McdConnectivityMonitor *connectivity_monitor
{
McdConnectivityMonitorPrivate *priv = connectivity_monitor->priv;
- return priv->connected;
+ return priv->connected && priv->awake;
}
gboolean