|
 |
19ba92d |
diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c
|
|
|
19ba92d |
--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 11:54:40.894171020 -0500
|
|
|
19ba92d |
+++ pidgin-2.7.11/libpurple/network.c 2011-04-26 12:00:55.533487383 -0500
|
|
|
19ba92d |
@@ -833,8 +833,20 @@ purple_network_is_available(void)
|
|
|
19ba92d |
purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");
|
|
|
19ba92d |
}
|
|
|
19ba92d |
|
|
|
19ba92d |
- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED)
|
|
|
19ba92d |
- return TRUE;
|
|
|
19ba92d |
+ switch (nm_state)
|
|
|
19ba92d |
+ {
|
|
|
19ba92d |
+ case NM_STATE_UNKNOWN:
|
|
|
19ba92d |
+#if NM_CHECK_VERSION(0,8,992)
|
|
|
19ba92d |
+ case NM_STATE_CONNECTED_LOCAL:
|
|
|
19ba92d |
+ case NM_STATE_CONNECTED_SITE:
|
|
|
19ba92d |
+ case NM_STATE_CONNECTED_GLOBAL:
|
|
|
19ba92d |
+#else
|
|
|
19ba92d |
+ case NM_STATE_CONNECTED:
|
|
|
19ba92d |
+#endif
|
|
|
19ba92d |
+ return TRUE;
|
|
|
19ba92d |
+ default:
|
|
|
19ba92d |
+ break;
|
|
|
19ba92d |
+ }
|
|
|
19ba92d |
|
|
|
19ba92d |
return FALSE;
|
|
|
19ba92d |
|
|
|
19ba92d |
@@ -1170,8 +1182,8 @@ purple_network_init(void)
|
|
|
19ba92d |
NM_DBUS_SERVICE,
|
|
|
19ba92d |
NM_DBUS_PATH,
|
|
|
19ba92d |
NM_DBUS_INTERFACE);
|
|
|
19ba92d |
- dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
|
|
|
19ba92d |
- dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
|
|
|
19ba92d |
+ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
|
|
|
19ba92d |
+ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
|
|
|
19ba92d |
G_CALLBACK(nm_state_change_cb), NULL, NULL);
|
|
|
19ba92d |
|
|
|
19ba92d |
dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,
|