From f99977dd150c84659950bacff36727adc7c05f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
Date: Fri, 12 Jul 2019 00:20:13 +0100
Subject: [PATCH] application: Hide --no-default-window option

It's a dead option since commit b80390d0c486a2c19ba7a8005e038c809a45763d

Hide it and drop it form the man page.

While we are at it, rearrange the code to group dead options together,
and elaborate on the code comment. Also, drop their descriptions, which
are useless for hidden options and may be wasting translators time.
---
 docs/nautilus.1            |  4 ----
 src/nautilus-application.c | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/docs/nautilus.1 b/docs/nautilus.1
index e526dd073..c6f0f7276 100644
--- a/docs/nautilus.1
+++ b/docs/nautilus.1
@@ -41,10 +41,6 @@ Show the version of the program.
 .BR \-w ", " \-\-new-window
 Always open a new window for browsing specified URIs.
 
-.TP
-.BR \-n ", " \-\-no-default-window
-Only create windows for explicitly specified URIs.
-
 .TP
 .BR \-q ", " \-\-quit
 Quit Nautilus.
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index f44e52b76..aff5ebf30 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -1065,24 +1065,26 @@ nautilus_application_init (NautilusApplication *self)
         { "check", 'c', 0, G_OPTION_ARG_NONE, NULL,
           N_("Perform a quick set of self-check tests."), NULL },
 #endif
-        /* dummy, only for compatibility reasons */
-        { "browser", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, NULL,
-          NULL, NULL },
-        /* ditto */
-        { "geometry", 'g', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, NULL,
-          N_("Create the initial window with the given geometry."), N_("GEOMETRY") },
         { "version", '\0', 0, G_OPTION_ARG_NONE, NULL,
           N_("Show the version of the program."), NULL },
         { "new-window", 'w', 0, G_OPTION_ARG_NONE, NULL,
           N_("Always open a new window for browsing specified URIs"), NULL },
-        { "no-default-window", 'n', 0, G_OPTION_ARG_NONE, NULL,
-          N_("Only create windows for explicitly specified URIs."), NULL },
         { "quit", 'q', 0, G_OPTION_ARG_NONE, NULL,
           N_("Quit Nautilus."), NULL },
         { "select", 's', 0, G_OPTION_ARG_NONE, NULL,
           N_("Select specified URI in parent folder."), NULL },
         { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, NULL, NULL, N_("[URI…]") },
 
+        /* The following are old options which have no effect anymore. We keep
+         * them around for compatibility reasons, e.g. not breaking old scripts.
+         */
+        { "browser", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, NULL,
+          NULL, NULL },
+        { "geometry", 'g', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, NULL,
+          NULL, NULL },
+        { "no-default-window", 'n', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, NULL,
+          NULL, NULL },
+
         { NULL }
     };
     NautilusApplicationPrivate *priv;