diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-05 20:20:25 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-05 20:20:25 -0500 |
| commit | 33c22f43a52aae722ce4d9cbe47f8d2fff31f395 (patch) | |
| tree | 71f9661d9a843cca28225852f8784e48a2b96cb2 /testing/pidgin/nm09-pidgin.patch | |
| parent | c87732e5659b56943ef4f120d7c71dcaabc3f849 (diff) | |
| parent | 3695b5d62c2aef6e82abc95d775a2ebd89bce081 (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-glew/PKGBUILD
testing/iproute2/PKGBUILD
Diffstat (limited to 'testing/pidgin/nm09-pidgin.patch')
| -rw-r--r-- | testing/pidgin/nm09-pidgin.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/testing/pidgin/nm09-pidgin.patch b/testing/pidgin/nm09-pidgin.patch new file mode 100644 index 000000000..1c2471d1f --- /dev/null +++ b/testing/pidgin/nm09-pidgin.patch @@ -0,0 +1,38 @@ +diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c +--- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600 ++++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600 +@@ -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 @@ nm_update_state(NMState state) + + 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 @@ nm_update_state(NMState state) + 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) |