diff options
author | Thomas Haller <thaller@redhat.com> | 2021-10-08 09:20:57 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2021-10-08 09:20:58 +0200 |
commit | dae5e0117173df8857b4a6f85edd18a16b5bcb9c (patch) | |
tree | ec68e06220a8268d0aaa131ffe92c8bccf9d66a2 /src | |
parent | 098a963e42a69b544a8505317f28a7ed1e616780 (diff) | |
download | NetworkManager-dae5e0117173df8857b4a6f85edd18a16b5bcb9c.tar.gz |
glib-aux: rename nm_g_timeout_add_source_seconds() to nm_g_timeout_add_seconds_source()
There is g_idle_add(), g_timeout_add() and g_timeout_add_seconds().
We have alternatives nm_g_idle_add_source() and
nm_g_timeout_add_source().
I find the previous name nm_g_timeout_add_source_seconds() inconsistent
with the pattern, and get it always wrong on first try. Rename.
Diffstat (limited to 'src')
-rw-r--r-- | src/libnm-glib-aux/nm-shared-utils.h | 2 | ||||
-rw-r--r-- | src/nm-dispatcher/nm-dispatcher.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h index a703cb83d4..f996b95691 100644 --- a/src/libnm-glib-aux/nm-shared-utils.h +++ b/src/libnm-glib-aux/nm-shared-utils.h @@ -1783,7 +1783,7 @@ nm_g_timeout_add_source(guint timeout_msec, GSourceFunc func, gpointer user_data } static inline GSource * -nm_g_timeout_add_source_seconds(guint timeout_sec, GSourceFunc func, gpointer user_data) +nm_g_timeout_add_seconds_source(guint timeout_sec, GSourceFunc func, gpointer user_data) { /* A convenience function to attach a new timeout source to the default GMainContext. * In that sense it's very similar to g_timeout_add_seconds() except that it returns a diff --git a/src/nm-dispatcher/nm-dispatcher.c b/src/nm-dispatcher/nm-dispatcher.c index b175d8eed3..b29f5acaca 100644 --- a/src/nm-dispatcher/nm-dispatcher.c +++ b/src/nm-dispatcher/nm-dispatcher.c @@ -553,7 +553,7 @@ script_dispatch(ScriptInfo *script) script->watch_source = nm_g_child_watch_add_source(script->pid, script_watch_cb, script); script->timeout_source = - nm_g_timeout_add_source_seconds(SCRIPT_TIMEOUT, script_timeout_cb, script); + nm_g_timeout_add_seconds_source(SCRIPT_TIMEOUT, script_timeout_cb, script); if (!script->wait) request->num_scripts_nowait++; return TRUE; |