From 741c93c4f604ec6c3da2e3e22b620430e3709e8b Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Thu, 25 Sep 2014 18:03:33 +0300 Subject: [PATCH] Fix for --display being fatal (Bug 11188) When xfsm saves the session it adds a --diplay option to the applications so they will correcly show up on the correct monitor when the session starts up again. Commit 791f02416560f5ac75250a9a67f4e2a3d0ac6f7c removed the g_option_context_add_group (context, gtk_get_option_group... call because it calls gtk_init before xfsettingsd has a chance to fork which can cause issues. This patch makes it so that the --display option is no longer fatal to xfsettingsd which doesn't require the option anyway as it will apply its settings to all the displays. --- xfsettingsd/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c index 063d4a2..d34a2cc 100644 --- a/xfsettingsd/main.c +++ b/xfsettingsd/main.c @@ -180,6 +180,7 @@ main (gint argc, gchar **argv) g_option_context_add_group (context, gtk_get_option_group (FALSE)); */ g_option_context_add_group (context, xfce_sm_client_get_option_group (argc, argv)); + g_option_context_set_ignore_unknown_options(context, TRUE); /* parse options */ if (!g_option_context_parse (context, &argc, &argv, &error)) -- 2.1.1