luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-28 00:16:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1737-gdbus-tool-wait' into 'master'

Browse Source 
gdbus-tool: Fix units for `gdbus-tool wait` timeout

Closes #1737

See merge request GNOME/glib!753
This commit is contained in:
Emmanuele Bassi 2019-04-03 12:36:54 +00:00
commit cf54fc3600
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gdbus-tool.c
View File

@ -2051,7 +2051,7 @@ handle_monitor (gint *argc,
static gboolean opt_wait_activate_set = FALSE; static gboolean opt_wait_activate_set = FALSE;
static gchar *opt_wait_activate_name = NULL; static gchar *opt_wait_activate_name = NULL;
static gint64 opt_wait_timeout = 0; /* no timeout */ static gint64 opt_wait_timeout_secs = 0; /* no timeout */
typedef enum { typedef enum {
WAIT_STATE_RUNNING, /* waiting to see the service */ WAIT_STATE_RUNNING, /* waiting to see the service */
@ -2078,7 +2078,7 @@ static const GOptionEntry wait_entries[] =
opt_wait_activate_cb, opt_wait_activate_cb,
N_("Service to activate before waiting for the other one (well-known name)"), N_("Service to activate before waiting for the other one (well-known name)"),
"[NAME]" }, "[NAME]" },
{ "timeout", 't', 0, G_OPTION_ARG_INT64, &opt_wait_timeout, { "timeout", 't', 0, G_OPTION_ARG_INT64, &opt_wait_timeout_secs,
N_("Timeout to wait for before exiting with an error (seconds); 0 for " N_("Timeout to wait for before exiting with an error (seconds); 0 for "
"no timeout (default)"), "SECS" }, "no timeout (default)"), "SECS" },
{ NULL } { NULL }
@ -2255,8 +2255,8 @@ handle_wait (gint *argc,
NULL, &wait_state, NULL); NULL, &wait_state, NULL);
/* Safety timeout. */ /* Safety timeout. */
if (opt_wait_timeout > 0) if (opt_wait_timeout_secs > 0)
timer_id = g_timeout_add (opt_wait_timeout, wait_timeout_cb, &wait_state); timer_id = g_timeout_add_seconds (opt_wait_timeout_secs, wait_timeout_cb, &wait_state);
while (wait_state == WAIT_STATE_RUNNING) while (wait_state == WAIT_STATE_RUNNING)
g_main_context_iteration (NULL, TRUE); g_main_context_iteration (NULL, TRUE);