[empathy: 14/26] empathy-connectivity: init priv->connected to TRUE if we're not using NM
- From: Jonny Lamb <jonnylamb src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy: 14/26] empathy-connectivity: init priv->connected to TRUE if we're not using NM
- Date: Thu, 20 Aug 2009 13:45:36 +0000 (UTC)
commit 1f9772288086230ec9b8ac63380ad90d413b73c0
Author: Jonny Lamb <jonny lamb collabora co uk>
Date: Wed Aug 19 15:01:16 2009 +0100
empathy-connectivity: init priv->connected to TRUE if we're not using NM
Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>
libempathy/empathy-connectivity.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index 4e75d7d..e9734e5 100644
--- a/libempathy/empathy-connectivity.c
+++ b/libempathy/empathy-connectivity.c
@@ -111,6 +111,8 @@ empathy_connectivity_init (EmpathyConnectivity *connectivity)
{
DEBUG ("Failed to get NetworkManager proxy");
}
+#else
+ priv->connected = TRUE;
#endif
}
@@ -257,11 +259,7 @@ empathy_connectivity_is_online (EmpathyConnectivity *connectivity)
if (priv->use_conn)
{
-#ifdef HAVE_NM
return priv->connected;
-#else
- return TRUE;
-#endif
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]