[empathy: 9/26] empathy-connectivity: handle changes in use_conn correctly
- From: Jonny Lamb <jonnylamb src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy: 9/26] empathy-connectivity: handle changes in use_conn correctly
- Date: Thu, 20 Aug 2009 13:45:10 +0000 (UTC)
commit d183b3dbbdd4bf1aea48eff08ae33ddd27f23e57
Author: Jonny Lamb <jonny lamb collabora co uk>
Date: Wed Aug 19 12:00:50 2009 +0100
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>
libempathy/empathy-connectivity.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index 47d0298..b06b57c 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");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]