diff options
| author | Michael Biebl <biebl@debian.org> | 2017-05-11 14:55:55 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-05-11 14:55:55 +0200 |
| commit | c333f062ddcba9b35330647bf6cbd0a07f2d786e (patch) | |
| tree | 257c3a0c74c09f4ad2328eab5b932806405f0c1c /src/settings/nm-agent-manager.c | |
| parent | a222e56e103f949b148a6942e385ccca2c26d9f3 (diff) | |
New upstream version 1.8.0 upstream/1.8.0
Diffstat (limited to 'src/settings/nm-agent-manager.c')
| -rw-r--r-- | src/settings/nm-agent-manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index 0db20979..3d6b1cfb 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -103,7 +103,7 @@ NM_DEFINE_SINGLETON_GETTER (NMAgentManager, nm_agent_manager_get, NM_TYPE_AGENT_ nm_secret_agent_get_description (__agent)); \ } else \ __prefix2[0] = '\0'; \ - _nm_log ((level), (_NMLOG_DOMAIN), 0, \ + _nm_log ((level), (_NMLOG_DOMAIN), 0, NULL, NULL, \ "%s%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ __prefix1, __prefix2 _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ } \ @@ -178,7 +178,7 @@ remove_agent (NMAgentManager *self, const char *owner) while (g_hash_table_iter_next (&iter, &data, NULL)) request_remove_agent ((Request *) data, agent, &pending_reqs); - /* We cannot call request_next_agent() from from within hash iterating loop, + /* We cannot call request_next_agent() from within hash iterating loop, * because it may remove the request from the hash table, which invalidates * the iterator. So, only remove the agent from requests. And store the requests * that should be sent to other agent to a temporary list to proceed afterwards. |