[empathy] Always react when disconnecting from the network



commit d57d431db13fa5fdbddc51d71b9f82da00418522
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Tue Jun 30 17:21:18 2009 +0100

    Always react when disconnecting from the network

 libempathy/empathy-idle.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index 78366e0..1686555 100644
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -244,8 +244,7 @@ idle_nm_state_change_cb (NMClient         *client,
 
 	priv = GET_PRIV (idle);
 
-	if (!priv->use_nm
-	    || priv->nm_saved_state == TP_CONNECTION_PRESENCE_TYPE_UNSET) {
+	if (!priv->use_nm) {
 		return;
 	}
 
@@ -266,7 +265,8 @@ idle_nm_state_change_cb (NMClient         *client,
 		priv->nm_saved_status = g_strdup (priv->status);
 		empathy_idle_set_state (idle, TP_CONNECTION_PRESENCE_TYPE_OFFLINE);
 	}
-	else if (!old_nm_connected && new_nm_connected) {
+	else if (!old_nm_connected && new_nm_connected
+			&& priv->nm_saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) {
 		/* We are now connected */
 		DEBUG ("Reconnected: Restore state %d (%s)",
 				priv->nm_saved_state, priv->nm_saved_status);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]