Annotation of /trunk/pidgin/patches/pidgin-2.10.0-nm09-more.patch
Parent Directory | Revision Log
Revision 1583 -
(hide annotations)
(download)
Tue Nov 29 10:45:33 2011 UTC (12 years, 10 months ago) by niro
File size: 1953 byte(s)
Tue Nov 29 10:45:33 2011 UTC (12 years, 10 months ago) by niro
File size: 1953 byte(s)
-added nm09 patch
1 | niro | 1583 | diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c |
2 | --- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500 | ||
3 | +++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500 | ||
4 | @@ -833,8 +833,20 @@ purple_network_is_available(void) | ||
5 | purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n"); | ||
6 | } | ||
7 | |||
8 | - if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED) | ||
9 | - return TRUE; | ||
10 | + switch (nm_state) | ||
11 | + { | ||
12 | + case NM_STATE_UNKNOWN: | ||
13 | +#if NM_CHECK_VERSION(0,8,992) | ||
14 | + case NM_STATE_CONNECTED_LOCAL: | ||
15 | + case NM_STATE_CONNECTED_SITE: | ||
16 | + case NM_STATE_CONNECTED_GLOBAL: | ||
17 | +#else | ||
18 | + case NM_STATE_CONNECTED: | ||
19 | +#endif | ||
20 | + return TRUE; | ||
21 | + default: | ||
22 | + break; | ||
23 | + } | ||
24 | |||
25 | return FALSE; | ||
26 | |||
27 | @@ -1170,9 +1182,14 @@ purple_network_init(void) | ||
28 | NM_DBUS_SERVICE, | ||
29 | NM_DBUS_PATH, | ||
30 | NM_DBUS_INTERFACE); | ||
31 | + /* NM 0.6 signal */ | ||
32 | dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID); | ||
33 | dbus_g_proxy_connect_signal(nm_proxy, "StateChange", | ||
34 | G_CALLBACK(nm_state_change_cb), NULL, NULL); | ||
35 | + /* NM 0.7 and later signal */ | ||
36 | + dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID); | ||
37 | + dbus_g_proxy_connect_signal(nm_proxy, "StateChanged", | ||
38 | + G_CALLBACK(nm_state_change_cb), NULL, NULL); | ||
39 | |||
40 | dbus_proxy = dbus_g_proxy_new_for_name(nm_conn, | ||
41 | DBUS_SERVICE_DBUS, | ||
42 | @@ -1207,6 +1224,7 @@ purple_network_uninit(void) | ||
43 | #ifdef HAVE_NETWORKMANAGER | ||
44 | if (nm_proxy) { | ||
45 | dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL); | ||
46 | + dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL); | ||
47 | g_object_unref(G_OBJECT(nm_proxy)); | ||
48 | } | ||
49 | if (dbus_proxy) { |