[gnome-boxes] app: Include various help option groups

[Zeeshan Ali <zeeshanak src gnome org>]

commit 931b07c0fbc8415d9ff6bf59c589f32c783b1aee
Author: Visarion-Mingopol Alexandru <viorel visarion gmail com>
Date:   Wed May 11 22:32:41 2016 +0300

    app: Include various help option groups
    
    Add option groups for spice-gtk, gtk-vnc and gtk+.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=703505

 src/app.vala           |    5 ++++-
 src/spice-display.vala |    2 ++
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/app.vala b/src/app.vala
index ee9e106..71fe097 100644
--- a/src/app.vala
+++ b/src/app.vala
@@ -196,7 +196,10 @@ private class Boxes.App: Gtk.Application {
         var parameter_string = _("— A simple application to access remote or virtual machines");
         var opt_context = new OptionContext (parameter_string);
         opt_context.add_main_entries (options, null);
-        opt_context.set_help_enabled (false);
+        opt_context.add_group (Spice.get_option_group ());
+        opt_context.add_group (Vnc.Display.get_option_group ());
+        opt_context.add_group (Gtk.get_option_group (true));
+        opt_context.set_help_enabled (true);
 
         try {
             string[] args1 = cmdline.get_arguments();
diff --git a/src/spice-display.vala b/src/spice-display.vala
index 1cb9fb3..7646f94 100644
--- a/src/spice-display.vala
+++ b/src/spice-display.vala
@@ -52,6 +52,8 @@ private class Boxes.SpiceDisplay: Boxes.Display {
         session = new Session ();
         audio = Spice.Audio.get (session, null);
         gtk_session = GtkSession.get (session);
+
+        Spice.set_session_option (session);
         try {
             var manager = UsbDeviceManager.get (session);