Prevented roxterm-config trying to parse the same options as roxterm

.gitignore

@@ -2,6 +2,7 @@
 *~
 *.lo
 *.la
+.cache
 Makefile
 Makefile.in
 .deps

debian/changelog

@@ -1,3 +1,11 @@
+roxterm (3.14.3-1) UNRELEASED; urgency=medium
+
+  * New upstream version:
+    + Prevent error messages caused by roxterm-config trying to parse
+      the same set of options as roxterm.
+
+ -- Tony Houghton <h@realh.co.uk>  Sat, 02 Dec 2023 18:21:21 +0000
+
 roxterm (3.14.2-1) unstable; urgency=high
 
   * New upstream version:

src/capplet.c

@@ -318,7 +318,7 @@ int main(int argc, char **argv)
 #endif    
 
     gtk_init(&argc, &argv);
-    global_options_init(&argc, &argv, TRUE);
+    global_options_init(&argc, &argv, FALSE);
     global_options_apply_dark_theme();
 
     resources_access_icon();

src/globalopts.c

@@ -501,7 +501,9 @@ void global_options_init(int *argc, char ***argv, gboolean report)
         global_options = options_open("Global", "roxterm options");
         correct_schemes();
     }
-    global_options_parse_argv(argc, argv, report);
+    /* roxterm-config doesn't use the same options as the main app */
+    if (!g_str_has_suffix((*argv)[0], "-config"))
+        global_options_parse_argv(argc, argv, report);
     if (!global_options_bindir)
     {
         global_options_init_bindir((*argv)[0]);