aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2009-08-19 19:00:50 +0800
committerJonny Lamb <jonny.lamb@collabora.co.uk>2009-08-19 19:00:50 +0800
commitd183b3dbbdd4bf1aea48eff08ae33ddd27f23e57 (patch)
treea8785dbcf407830a4cd9ad9443365d4998a2fff0
parent4080b07d140362f0d2888d0baf6a4ecf60e8ea2a (diff)
downloadgsoc2013-empathy-d183b3dbbdd4bf1aea48eff08ae33ddd27f23e57.tar
gsoc2013-empathy-d183b3dbbdd4bf1aea48eff08ae33ddd27f23e57.tar.gz
gsoc2013-empathy-d183b3dbbdd4bf1aea48eff08ae33ddd27f23e57.tar.bz2
gsoc2013-empathy-d183b3dbbdd4bf1aea48eff08ae33ddd27f23e57.tar.lz
gsoc2013-empathy-d183b3dbbdd4bf1aea48eff08ae33ddd27f23e57.tar.xz
gsoc2013-empathy-d183b3dbbdd4bf1aea48eff08ae33ddd27f23e57.tar.zst
gsoc2013-empathy-d183b3dbbdd4bf1aea48eff08ae33ddd27f23e57.zip
empathy-connectivity: handle changes in use_conn correctly
This is so that the presence chooser can get notified if use_conn turns to false, and NM still reports us as offline, so it can become sensitive again. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--libempathy/empathy-connectivity.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index 47d02989e..b06b57cb8 100644
--- a/libempathy/empathy-connectivity.c
+++ b/libempathy/empathy-connectivity.c
@@ -290,8 +290,18 @@ empathy_connectivity_set_use_conn (EmpathyConnectivity *connectivity,
#ifdef HAVE_NM
if (use_conn)
- connectivity_nm_state_change_cb (priv->nm_client, NULL, connectivity);
+ {
+ connectivity_nm_state_change_cb (priv->nm_client, NULL, connectivity);
+#else
+ if (FALSE)
+ {
#endif
+ }
+ else
+ {
+ g_signal_emit (connectivity, signals[STATE_CHANGE], 0,
+ FALSE, TRUE);
+ }
g_object_notify (G_OBJECT (connectivity), "use-conn");
}