fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 08:30:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-12-04 Dan Williams <dcbw@redhat.com>

Browse source 
* src/supplicant-manager/nm-supplicant-interface.c
		- (nm_supplicant_interface_set_property): track signal handler ID
		- (nm_supplicant_interface_dispose): remove signal handler on dispose


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2162 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2006-12-04 20:33:06 +00:00
parent a2b8e034fe
commit 4b647c97a8
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-12-04 Dan Williams <dcbw@redhat.com>
* src/supplicant-manager/nm-supplicant-interface.c
- (nm_supplicant_interface_set_property): track signal handler ID
- (nm_supplicant_interface_dispose): remove signal handler on dispose
2006-12-04 Dan Williams <dcbw@redhat.com>
* src/supplicant-manager/nm-supplicant-interface.[ch]

19
src/supplicant-manager/nm-supplicant-interface.c
View file

@ -90,6 +90,7 @@ enum {
struct _NMSupplicantInterfacePrivate
{
NMSupplicantManager * smgr;
gulong smgr_state_sig_handler;
NMDBusManager * dbus_mgr;
NMDevice * dev;
@ -210,16 +211,18 @@ nm_supplicant_interface_set_property (GObject * object,
GParamSpec * pspec)
{
NMSupplicantInterface * self = NM_SUPPLICANT_INTERFACE (object);
gulong id;
switch (prop_id) {
case PROP_SUPPLICANT_MANAGER:
self->priv->smgr = NM_SUPPLICANT_MANAGER (g_value_get_object (value));
g_object_ref (G_OBJECT (self->priv->smgr));
g_signal_connect (G_OBJECT (self->priv->smgr),
"state",
G_CALLBACK (nm_supplicant_interface_smgr_state_changed),
self);
id = g_signal_connect (G_OBJECT (self->priv->smgr),
"state",
G_CALLBACK (nm_supplicant_interface_smgr_state_changed),
self);
self->priv->smgr_state_sig_handler = id;
break;
case PROP_DEVICE:
self->priv->dev = NM_DEVICE (g_value_get_object (value));
@ -291,6 +294,8 @@ nm_supplicant_interface_dispose (GObject *object)
}
if (self->priv->smgr) {
g_signal_handler_disconnect (G_OBJECT (self->priv->smgr),
self->priv->smgr_state_sig_handler);
g_object_unref (self->priv->smgr);
self->priv->smgr = NULL;
}
@ -304,8 +309,10 @@ nm_supplicant_interface_dispose (GObject *object)
clear_pcalls (self);
if (self->priv->dbus_mgr) {
nm_dbus_manager_remove_signal_handler (self->priv->dbus_mgr,
self->priv->wpas_sig_handler_id);
if (self->priv->wpas_sig_handler_id) {
nm_dbus_manager_remove_signal_handler (self->priv->dbus_mgr,
self->priv->wpas_sig_handler_id);
}
g_object_unref (self->priv->dbus_mgr);
self->priv->dbus_mgr = NULL;