diff options
| author | Bastien Nocera <hadess@hadess.net> | 2018-05-02 10:39:47 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2018-05-02 15:20:12 +0200 |
| commit | 72d800899759425dc87c87b570dc5c84635a5eda (patch) | |
| tree | d7cff6f6075aeea9be65ba9db9997b2f9a6cdba5 | |
| parent | a5e588511bb9727b527c93fc25d28531ac24256c (diff) | |
| download | geoclue-72d800899759425dc87c87b570dc5c84635a5eda.tar.gz | |
Move default timeout to main binary
Rather than have the default 5 seconds timeout in 2 separate locations,
move the default timeout value to the binary, so as to reduce the
difference between the interactive and non-interactive behaviour, and
reduce confusion.
https://bugs.freedesktop.org/show_bug.cgi?id=106249
| -rw-r--r-- | data/geoclue.service.in | 2 | ||||
| -rw-r--r-- | data/org.freedesktop.GeoClue2.service.in | 2 | ||||
| -rw-r--r-- | src/gclue-main.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/geoclue.service.in b/data/geoclue.service.in index 812cb67..dc77b48 100644 --- a/data/geoclue.service.in +++ b/data/geoclue.service.in @@ -5,4 +5,4 @@ Description=Location Lookup Service Type=dbus BusName=org.freedesktop.GeoClue2 User=@dbus_srv_user@ -ExecStart=@libexecdir@/geoclue -t 5 +ExecStart=@libexecdir@/geoclue diff --git a/data/org.freedesktop.GeoClue2.service.in b/data/org.freedesktop.GeoClue2.service.in index ef16223..ac38e38 100644 --- a/data/org.freedesktop.GeoClue2.service.in +++ b/data/org.freedesktop.GeoClue2.service.in @@ -1,5 +1,5 @@ [D-BUS Service] Name=org.freedesktop.GeoClue2 -Exec=@libexecdir@/geoclue -t 5 +Exec=@libexecdir@/geoclue User=@dbus_srv_user@ SystemdService=geoclue.service diff --git a/src/gclue-main.c b/src/gclue-main.c index d596ffc..55db069 100644 --- a/src/gclue-main.c +++ b/src/gclue-main.c @@ -33,7 +33,7 @@ /* Commandline options */ static gboolean version = FALSE; -static gint inactivity_timeout = 0; +static gint inactivity_timeout = 5; static gboolean submit_data = FALSE; static char *submit_nick = NULL; @@ -51,7 +51,7 @@ static GOptionEntry entries[] = 0, G_OPTION_ARG_INT, &inactivity_timeout, - N_("Exit after T seconds of inactivity. Default: 0 (never)"), + N_("Exit after T seconds of inactivity, 0 for never. Default: 5"), "T" }, { "submit-data", 's', |