Updated Polish translation

[empathy.git] / libempathy / empathy-connectivity.c

diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index f033e42e85d621c1a535221ceefb412386df2843..f6a723ef6e91f6e586d92c4fc422a5097ae39147 100644 (file)
--- a/libempathy/empathy-connectivity.c
+++ b/libempathy/empathy-connectivity.c
@@ -105,7 +105,8 @@ connectivity_nm_state_change_cb (NMClient *client,
   new_nm_connected = !(state == NM_STATE_CONNECTING
       || state == NM_STATE_DISCONNECTED);
 
-  DEBUG ("New NetworkManager network state %d", state);
+  DEBUG ("New NetworkManager network state %d (connected: %s)", state,
+      new_nm_connected ? "true" : "false");
 
   connectivity_change_state (connectivity, new_nm_connected);
 }
@@ -151,6 +152,8 @@ connectivity_connman_check_state_cb (DBusGProxy *proxy,
   else
     {
       DEBUG ("Failed to call GetState: %s", error->message);
+      connectivity_connman_state_changed_cb (proxy, "offline",
+          connectivity);
     }
 }
 
@@ -227,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
 }
@@ -380,14 +383,7 @@ empathy_connectivity_is_online (EmpathyConnectivity *connectivity)
 {
   EmpathyConnectivityPriv *priv = GET_PRIV (connectivity);
 
-  if (priv->use_conn)
-    {
-      return priv->connected;
-    }
-  else
-    {
-      return TRUE;
-    }
+  return priv->connected;
 }
 
 gboolean