← easystroke

Process --help right away

ad9d5ea601588791150eda7107c7bfe40fb58d96 · Thomas Jaeger · Mar 1, 2013 04:15

We might not have a display and a dbus connection when building the man
page, so we can't rely on GtkApplication's local_command_line function.

+14 −3 · 1 file changed

• main.cc +14 −3

diff --git a/main.cc b/main.cc
index 5442a99..55d0b3c 100644
--- a/main.cc
+++ b/main.cc
@@ -169,6 +169,9 @@ public:
 	App(int& argc, char**& argv, const Glib::ustring& application_id, Gio::ApplicationFlags flags=Gio::APPLICATION_FLAGS_NONE) :
 		Gtk::Application(argc, argv, application_id, flags), remote(false) {}
 	~App();
+
+	static void usage(const char *me);
+	static void version();
 protected:
 	virtual void on_startup();
 	virtual void on_activate();
@@ -177,9 +180,6 @@ private:
 	int on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine> &);
 	void run_by_name(const char *str, const Glib::RefPtr<Gio::ApplicationCommandLine> &cmd_line);
 
-	void usage(const char *me);
-	void version();
-
 	void create_config_dir();
 
 	void on_about(const Glib::VariantBase &) { win->show_about(); }
@@ -491,6 +491,17 @@ int main(int argc, char **argv) {
 		trefoil->draw_svg("easystroke.svg");
 		exit(EXIT_SUCCESS);
 	}
+	// GtkApplication needs dbus to even invoke the local_command_line function
+	if (argc > 1 && !strcmp(argv[1], "--help")) {
+		App::usage(argv[0]);
+		return EXIT_SUCCESS;
+	}
+
+	if (argc > 1 && !strcmp(argv[1], "--version")) {
+		App::usage(argv[0]);
+		return EXIT_SUCCESS;
+	}
+
 	App app(argc, argv, "org.easystroke.easystroke", Gio::APPLICATION_HANDLES_COMMAND_LINE);
 	return app.run(argc, argv);
 }