From 098a2b27937b9b6fb8e890180c735706380dfb92 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 16 Mar 2022 20:34:01 +0200 Subject: [PATCH 42/42] gtk4: Check against unknown command-line options See osdn #42916 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.22/gui_main.c | 3 --- client/gui-gtk-4.0/gui_main.c | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/client/gui-gtk-3.22/gui_main.c b/client/gui-gtk-3.22/gui_main.c index c56452a53e..a663a33f9d 100644 --- a/client/gui-gtk-3.22/gui_main.c +++ b/client/gui-gtk-3.22/gui_main.c @@ -321,9 +321,6 @@ static void parse_options(int argc, char **argv) free(option); } /* Can't check against unknown options, as those might be gtk options */ - /* TODO: gtk+ is about to drop its commandline options anyway, - * so we can stop supporting them and have error checking - * added here. */ i++; } diff --git a/client/gui-gtk-4.0/gui_main.c b/client/gui-gtk-4.0/gui_main.c index fd6be23164..3cdeb83798 100644 --- a/client/gui-gtk-4.0/gui_main.c +++ b/client/gui-gtk-4.0/gui_main.c @@ -308,11 +308,11 @@ static void parse_options(int argc, char **argv) exit(EXIT_FAILURE); } free(option); + } else { + fc_fprintf(stderr, _("Unknown command-line option \"%s\".\n"), + argv[i]); + exit(EXIT_FAILURE); } - /* Can't check against unknown options, as those might be gtk options */ - /* TODO: gtk is about to drop its commandline options anyway, - * so we can stop supporting them and have error checking - * added here. */ i++; } -- 2.35.1