luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-14 03:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-1737-gdbus-tool-wait-timeout-glib-2-60' into 'glib-2-60'

Browse Source 
Backport !753 “gdbus-tool: Fix units for `gdbus-tool wait` timeout” to glib-2-60

See merge request GNOME/glib!764
This commit is contained in:
Sebastian Dröge 2019-04-09 08:54:16 +00:00
commit 13ea376a54
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

@ -2050,7 +2050,7 @@ handle_monitor (gint *argc,
static gboolean opt_wait_activate_set = FALSE;
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 {
WAIT_STATE_RUNNING, /* waiting to see the service */
@ -2077,7 +2077,7 @@ static const GOptionEntry wait_entries[] =
opt_wait_activate_cb,
N_("Service to activate before waiting for the other one (well-known 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 "
"no timeout (default)"), "SECS" },
{ NULL }
@ -2254,8 +2254,8 @@ handle_wait (gint *argc,
NULL, &wait_state, NULL);
/* Safety timeout. */
if (opt_wait_timeout > 0)
timer_id = g_timeout_add (opt_wait_timeout, wait_timeout_cb, &wait_state);
if (opt_wait_timeout_secs > 0)
timer_id = g_timeout_add_seconds (opt_wait_timeout_secs, wait_timeout_cb, &wait_state);
while (wait_state == WAIT_STATE_RUNNING)
g_main_context_iteration (NULL, TRUE);