aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-06-01 19:06:50 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-06-01 23:57:47 +0800
commitb06c101e97689187240ea55fe1d3e399ed0960e0 (patch)
tree4e5a3c481c9e467a4b8a7399ea0c01d5b7b149e9
parenteb8b217e20baaa817371266abf43f32de24bd906 (diff)
downloadgsoc2013-empathy-b06c101e97689187240ea55fe1d3e399ed0960e0.tar
gsoc2013-empathy-b06c101e97689187240ea55fe1d3e399ed0960e0.tar.gz
gsoc2013-empathy-b06c101e97689187240ea55fe1d3e399ed0960e0.tar.bz2
gsoc2013-empathy-b06c101e97689187240ea55fe1d3e399ed0960e0.tar.lz
gsoc2013-empathy-b06c101e97689187240ea55fe1d3e399ed0960e0.tar.xz
gsoc2013-empathy-b06c101e97689187240ea55fe1d3e399ed0960e0.tar.zst
gsoc2013-empathy-b06c101e97689187240ea55fe1d3e399ed0960e0.zip
Don't set NM presence state on connect when it was unset
When the presence state that was saved upon disconnect was _UNSET don't try to set it when we reconnect.
-rw-r--r--libempathy/empathy-idle.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index dbc1473e8..92ab9f39f 100644
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -230,7 +230,8 @@ idle_nm_state_change_cb (DBusGProxy *proxy,
priv = GET_PRIV (idle);
- if (!priv->use_nm) {
+ if (!priv->use_nm
+ || priv->nm_saved_state == TP_CONNECTION_PRESENCE_TYPE_UNSET) {
return;
}