aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-08-28 00:01:57 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-08-28 04:11:49 +0800
commit09a260ea67ff01a17877c53e43ff1af6f28a59b6 (patch)
tree97ed94b6e850a17b5a24a4fb6a6ffd34b912b350
parent698b2c1a3ba1f5d9a27d5c30520e0dd0e8bb92bf (diff)
downloadgsoc2013-empathy-09a260ea67ff01a17877c53e43ff1af6f28a59b6.tar
gsoc2013-empathy-09a260ea67ff01a17877c53e43ff1af6f28a59b6.tar.gz
gsoc2013-empathy-09a260ea67ff01a17877c53e43ff1af6f28a59b6.tar.bz2
gsoc2013-empathy-09a260ea67ff01a17877c53e43ff1af6f28a59b6.tar.lz
gsoc2013-empathy-09a260ea67ff01a17877c53e43ff1af6f28a59b6.tar.xz
gsoc2013-empathy-09a260ea67ff01a17877c53e43ff1af6f28a59b6.tar.zst
gsoc2013-empathy-09a260ea67ff01a17877c53e43ff1af6f28a59b6.zip
Only assume connected when we have neither Connman or NM
-rw-r--r--libempathy/empathy-connectivity.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index 77c715a04..b65421664 100644
--- a/libempathy/empathy-connectivity.c
+++ b/libempathy/empathy-connectivity.c
@@ -230,7 +230,7 @@ empathy_connectivity_init (EmpathyConnectivity *connectivity)
}
#endif
-#if !defined(HAVE_NM) || !defined(HAVE_CONNMAN)
+#if !defined(HAVE_NM) && !defined(HAVE_CONNMAN)
priv->connected = TRUE;
#endif
}