[Xfce4-commits] [xfce/xfce4-settings] 01/01: Fix for --display being fatal (Bug 11188)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

bluesabre pushed a commit to branch master
in repository xfce/xfce4-settings.

commit 178f429abeba73643fe6ef794a07b78f3b40e5cf
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Thu Sep 25 18:03:33 2014 +0300

    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.
    
    Signed-off-by: Sean Davis <smd.seandavis at gmail.com>
---
 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))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.