[glib/glib-2-60: 1/2] gdbus-tool: Fix units for `gdbus-tool wait` timeout

[Sebastian Dröge <sdroege src gnome org>]

commit 7bd0160a1712d947aef54d74ccd5be18edb0704a
Author: Philip Withnall <withnall endlessm com>
Date:   Wed Mar 27 17:04:58 2019 +0000

    gdbus-tool: Fix units for `gdbus-tool wait` timeout
    
    They were documented as being in seconds, but implemented as
    milliseconds.
    
    Signed-off-by: Philip Withnall <withnall endlessm com>
    
    Fixes: #1737

 gio/gdbus-tool.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gio/gdbus-tool.c b/gio/gdbus-tool.c
index 8d06f191b..5fc4027b1 100644
--- a/gio/gdbus-tool.c
+++ b/gio/gdbus-tool.c
@@ -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);