Mercurial > pidgin.yaz
changeset 31905:f5a18dd894cc
Support new connection states in NetworkMakanter 0.9. Fixes #13505.
committer: John Bailey <rekkanoryo@rekkanoryo.org>
| author | dcbw@redhat.com |
|---|---|
| date | Fri, 08 Apr 2011 00:49:24 +0000 |
| parents | 87825f9602e8 |
| children | 15581933dc31 |
| files | libpurple/network.c |
| diffstat | 1 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/network.c Thu Apr 07 02:21:14 2011 +0000 +++ b/libpurple/network.c Fri Apr 08 00:49:24 2011 +0000 @@ -71,6 +71,10 @@ #include <dbus/dbus-glib.h> #include <NetworkManager.h> +#if !defined(NM_CHECK_VERSION) +#define NM_CHECK_VERSION(x,y,z) 0 +#endif + static DBusGConnection *nm_conn = NULL; static DBusGProxy *nm_proxy = NULL; static DBusGProxy *dbus_proxy = NULL; @@ -863,7 +867,13 @@ switch(state) { +#if NM_CHECK_VERSION(0,8,992) + case NM_STATE_CONNECTED_LOCAL: + case NM_STATE_CONNECTED_SITE: + case NM_STATE_CONNECTED_GLOBAL: +#else case NM_STATE_CONNECTED: +#endif /* Call res_init in case DNS servers have changed */ res_init(); /* update STUN IP in case we it changed (theoretically we could @@ -880,6 +890,9 @@ case NM_STATE_ASLEEP: case NM_STATE_CONNECTING: case NM_STATE_DISCONNECTED: +#if NM_CHECK_VERSION(0,8,992) + case NM_STATE_DISCONNECTING: +#endif if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) break; if (ui_ops != NULL && ui_ops->network_disconnected != NULL)