2005-05-05 Ray Strode <rstrode@redhat.com>

* src/nm-netlink-monitor.c:
		- Use clear_event_source instead of g_nullify_pointer() again.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@610 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Ray Strode
2005-05-05 23:30:59 +00:00
parent 1ea8594505
commit 8b6b5aea0f
2 changed files with 13 additions and 1 deletions

View File

@@ -1,3 +1,8 @@
2005-05-05 Ray Strode <rstrode@redhat.com>
* src/nm-netlink-monitor.c:
- Use clear_event_source instead of g_nullify_pointer() again.
2005-05-05 Dan Williams <dcbw@redhat.com> 2005-05-05 Dan Williams <dcbw@redhat.com>
* gnome/applet/main.c * gnome/applet/main.c

View File

@@ -268,6 +268,13 @@ nm_netlink_monitor_new (void)
return NM_NETLINK_MONITOR (instance); return NM_NETLINK_MONITOR (instance);
} }
static void
nm_netlink_monitor_clear_event_source (NmNetlinkMonitor *monitor)
{
monitor->priv->event_source = NULL;
}
void void
nm_netlink_monitor_attach (NmNetlinkMonitor *monitor, nm_netlink_monitor_attach (NmNetlinkMonitor *monitor,
GMainContext *context) GMainContext *context)
@@ -290,7 +297,7 @@ nm_netlink_monitor_attach (NmNetlinkMonitor *monitor,
(GSourceFunc) nm_netlink_monitor_event_handler, (GSourceFunc) nm_netlink_monitor_event_handler,
monitor, monitor,
(GDestroyNotify) (GDestroyNotify)
g_nullify_pointer); nm_netlink_monitor_clear_event_source);
g_source_attach (event_source, context); g_source_attach (event_source, context);
monitor->priv->event_source = event_source; monitor->priv->event_source = event_source;
} }