[devhelp] Convert to new-style commandline option handling

[Frederic Peters <fpeters src gnome org>]

commit 1de0fb9f6cbe431c80c37b91af3923b2c9a126e0
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Apr 16 16:33:22 2014 -0700

    Convert to new-style commandline option handling
    
    Use g_application_add_main_option_entries. This automatically
    handles --help, and avoids manual parsing of the options, and
    also adds support for --gapplication-service.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=728384

 src/dh-app.c  |   82 ++++++++++++++++++++++++++++++++++++++++++++++++-
 src/dh-main.c |   95 ---------------------------------------------------------
 2 files changed, 81 insertions(+), 96 deletions(-)
---
diff --git a/src/dh-app.c b/src/dh-app.c
index 53a058f..e776e19 100644
--- a/src/dh-app.c
+++ b/src/dh-app.c
@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include <stdlib.h>
 #include <glib/gi18n.h>
 
 #include "devhelp.h"
@@ -388,11 +389,86 @@ dh_app_new (void)
 {
         return g_object_new (DH_TYPE_APP,
                              "application-id",   "org.gnome.Devhelp",
-                             "flags",            G_APPLICATION_FLAGS_NONE,
+                             "flags",            G_APPLICATION_HANDLES_COMMAND_LINE,
                              "register-session", TRUE,
                              NULL);
 }
 
+static gboolean  option_version;
+
+static GOptionEntry options[] = {
+        { "new-window", 'n',
+          0, G_OPTION_ARG_NONE, NULL,
+          N_("Opens a new Devhelp window"),
+          NULL
+        },
+        { "search", 's',
+          0, G_OPTION_ARG_STRING, NULL,
+          N_("Search for a keyword"),
+          N_("KEYWORD")
+        },
+        { "search-assistant", 'a',
+          0, G_OPTION_ARG_STRING, NULL,
+          N_("Search and display any hit in the assistant window"),
+          N_("KEYWORD")
+        },
+        { "version", 'v',
+          0, G_OPTION_ARG_NONE, &option_version,
+          N_("Display the version and exit"),
+          NULL
+        },
+        { "quit", 'q',
+          0, G_OPTION_ARG_NONE, NULL,
+          N_("Quit any running Devhelp"),
+          NULL
+        },
+        { NULL }
+};
+
+static gint
+dh_app_handle_local_options (GApplication *app,
+                             GVariantDict *options)
+{
+  if (option_version)
+    {
+      g_print ("%s %s\n", g_get_application_name (), PACKAGE_VERSION);
+      exit (0);
+    }
+
+  return -1;
+}
+
+static gint
+dh_app_command_line (GApplication            *app,
+                     GApplicationCommandLine *command_line)
+{
+        gboolean option_new_window = FALSE;
+        const gchar *option_search = NULL;
+        const gchar *option_search_assistant = NULL;
+        gboolean option_quit = FALSE;
+        GVariantDict *options;
+
+        options = g_application_command_line_get_options_dict (command_line);
+        g_variant_dict_lookup (options, "new-window", "b", &option_new_window);
+        g_variant_dict_lookup (options, "search", "&s", &option_search);
+        g_variant_dict_lookup (options, "search-assistant", "&s", &option_search_assistant);
+        g_variant_dict_lookup (options, "quit", "b", &option_quit);
+
+        if (option_new_window) {
+                dh_app_new_window (DH_APP (app));
+        } else if (option_quit) {
+                dh_app_quit (DH_APP (app));
+        } else if (option_search) {
+                dh_app_search (DH_APP (app), option_search);
+        } else if (option_search_assistant) {
+                dh_app_search_assistant (DH_APP (app), option_search_assistant);
+        } else {
+                dh_app_raise (DH_APP (app));
+        }
+
+        return 0;
+}
+
 static void
 dh_app_init (DhApp *app)
 {
@@ -400,6 +476,8 @@ dh_app_init (DhApp *app)
          * for transliteration only) */
         g_set_application_name (_("Devhelp"));
         gtk_window_set_default_icon_name ("devhelp");
+
+        g_application_add_main_option_entries (G_APPLICATION (app), options);
 }
 
 static void
@@ -420,6 +498,8 @@ dh_app_class_init (DhAppClass *klass)
         GApplicationClass *application_class = G_APPLICATION_CLASS (klass);
 
         application_class->startup = dh_app_startup;
+        application_class->handle_local_options = dh_app_handle_local_options;
+        application_class->command_line = dh_app_command_line;
 
         object_class->dispose = dh_app_dispose;
 }
diff --git a/src/dh-main.c b/src/dh-main.c
index 9957da6..766c4a2 100644
--- a/src/dh-main.c
+++ b/src/dh-main.c
@@ -29,75 +29,10 @@
 #include "devhelp.h"
 #include "dh-app.h"
 
-static gboolean  option_new_window;
-static gchar    *option_search;
-static gchar    *option_search_assistant;
-static gboolean  option_quit;
-static gboolean  option_version;
-
-static GOptionEntry options[] = {
-        { "new-window", 'n',
-          0, G_OPTION_ARG_NONE, &option_new_window,
-          N_("Opens a new Devhelp window"),
-          NULL
-        },
-        { "search", 's',
-          0, G_OPTION_ARG_STRING, &option_search,
-          N_("Search for a keyword"),
-          N_("KEYWORD")
-        },
-        { "search-assistant", 'a',
-          0, G_OPTION_ARG_STRING, &option_search_assistant,
-          N_("Search and display any hit in the assistant window"),
-          N_("KEYWORD")
-        },
-        { "version", 'v',
-          0, G_OPTION_ARG_NONE, &option_version,
-          N_("Display the version and exit"),
-          NULL
-        },
-        { "quit", 'q',
-          0, G_OPTION_ARG_NONE, &option_quit,
-          N_("Quit any running Devhelp"),
-          NULL
-        },
-        { NULL }
-};
-
-static void
-run_action (DhApp *application,
-            gboolean is_remote)
-{
-        if (option_new_window) {
-                if (is_remote)
-                        dh_app_new_window (application);
-        } else if (option_quit) {
-                dh_app_quit (application);
-        } else if (option_search) {
-                dh_app_search (application, option_search);
-        } else if (option_search_assistant) {
-                dh_app_search_assistant (application, option_search_assistant);
-        } else {
-                if (is_remote)
-                        dh_app_raise (application);
-        }
-}
-
-static void
-activate_cb (GtkApplication *application)
-{
-        /* This is the primary instance */
-        dh_app_new_window (DH_APP (application));
-
-        /* Run the requested action from the command line */
-        run_action (DH_APP (application), FALSE);
-}
-
 int
 main (int argc, char **argv)
 {
         DhApp   *application;
-        GError  *error = NULL;
         gint     status;
 
         setlocale (LC_ALL, "");
@@ -105,38 +40,8 @@ main (int argc, char **argv)
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         textdomain (GETTEXT_PACKAGE);
 
-        if (!gtk_init_with_args (&argc, &argv, NULL, options, GETTEXT_PACKAGE, &error)) {
-                g_printerr ("%s\n", error->message);
-                return EXIT_FAILURE;
-        }
-
-        if (option_version) {
-                g_print ("%s\n", PACKAGE_STRING);
-                return EXIT_SUCCESS;
-        }
-
         /* Create new DhApp */
         application = dh_app_new ();
-        g_signal_connect (application, "activate", G_CALLBACK (activate_cb), NULL);
-
-        /* Set it as the default application */
-        g_application_set_default (G_APPLICATION (application));
-
-        /* Try to register the application... */
-        if (!g_application_register (G_APPLICATION (application), NULL, &error)) {
-                g_printerr ("Couldn't register Devhelp instance: '%s'\n",
-                            error ? error->message : "");
-                g_object_unref (application);
-                return EXIT_FAILURE;
-        }
-
-        /* Actions on a remote Devhelp already running? */
-        if (g_application_get_is_remote (G_APPLICATION (application))) {
-                /* Run the requested action from the command line */
-                run_action (application, TRUE);
-                g_object_unref (application);
-                return EXIT_SUCCESS;
-        }
 
         /* And run the GtkApplication */
         status = g_application_run (G_APPLICATION (application), argc, argv);