Mercurial > pidgin
changeset 22894:40364452eeaa
merge of '62e372ea0e5f6eb1b56f43621e580e3e3be7e894'
and 'cd52e24aa4674e626d22e1b9855726346732a8a4'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 10 May 2008 23:21:34 +0000 |
| parents | f5d39c44465a (diff) 0b3dfb83e7c0 (current diff) |
| children | 0bd86dae2734 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/network.c Sat May 10 21:36:14 2008 +0000 +++ b/libpurple/network.c Sat May 10 23:21:34 2008 +0000 @@ -738,8 +738,8 @@ NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE); - dbus_g_proxy_add_signal(nm_proxy, NM_DBUS_SIGNAL_STATE_CHANGE, G_TYPE_UINT, G_TYPE_INVALID); - dbus_g_proxy_connect_signal(nm_proxy, NM_DBUS_SIGNAL_STATE_CHANGE, + dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL, NULL); dbus_proxy = dbus_g_proxy_new_for_name(nm_conn, @@ -764,7 +764,7 @@ { #ifdef HAVE_NETWORKMANAGER_NETWORKMANAGER_H if (nm_proxy) { - dbus_g_proxy_disconnect_signal(nm_proxy, NM_DBUS_SIGNAL_STATE_CHANGE, G_CALLBACK(nm_state_change_cb), NULL); + dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL); g_object_unref(G_OBJECT(nm_proxy)); } if (dbus_proxy) {