diff options
| author | Antti Kaijanmäki <antti@kaijanmaki.net> | 2008-08-18 08:30:28 +0000 |
|---|---|---|
| committer | Antti Kaijanmäki <antti@kaijanmaki.net> | 2008-08-18 08:30:28 +0000 |
| commit | 2c21a2fe6b0498585fba0beb003ac8aa6351803c (patch) | |
| tree | 9544edfe2ed9a6c96eda933c35fb5110f1d666c6 /src/nm-netlink-monitor.c | |
| parent | e04934d93efba622123809cc767488af673b2967 (diff) | |
| download | NetworkManager-mbca.tar.gz | |
keep up with trunkmbca
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/mbca@3981 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'src/nm-netlink-monitor.c')
| -rw-r--r-- | src/nm-netlink-monitor.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c index a6d8395409..0e9c87294f 100644 --- a/src/nm-netlink-monitor.c +++ b/src/nm-netlink-monitor.c @@ -434,7 +434,10 @@ nm_netlink_monitor_request_status (NMNetlinkMonitor *monitor, /* Update the link cache with latest state */ if (nl_cache_refill (priv->nlh, priv->nlh_link_cache)) { - nm_warning ("Error updating link cache: %s", nl_geterror ()); + g_set_error (error, NM_NETLINK_MONITOR_ERROR, + NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE, + _("error updating link cache: %s"), + nl_geterror ()); return FALSE; } @@ -487,7 +490,7 @@ nm_netlink_monitor_error_handler (GIOChannel *channel, { GError *socket_error; - g_return_val_if_fail (!(io_condition & ~(NM_NETLINK_MONITOR_ERROR_CONDITIONS)), FALSE); + g_return_val_if_fail (io_condition & NM_NETLINK_MONITOR_ERROR_CONDITIONS, FALSE); socket_error = g_error_new (NM_NETLINK_MONITOR_ERROR, NM_NETLINK_MONITOR_ERROR_WAITING_FOR_SOCKET_DATA, |