Merge lp:~fabiozaramella/audience/fix-1044329 into lp:~audience-members/audience/trunk

[Fabio Zaramella]

add --version command

[Viko Adi Rahmawan (vikoadi)]

Hello fabio,
It would be better if its added into Granite.Applications,
we'll have --version for all apps

Unmerged revisions

486. By Fabio Zaramella on 2015-02-01

--version command

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2015-01-07 10:29:27 +0000
+++ src/Audience.vala	2015-02-01 14:57:21 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ * Copyright (c) 2013-2015 Audience Developers (http://launchpad.net/pantheon-chat)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,47 @@
 
     public Audience.Settings settings; //global space for easier access...
 
+    namespace Options {
+        private static bool PRINT_VERSION = false;
+    }
+
+    public static const OptionEntry[] app_options = {
+        { "version", 'v', 0, OptionArg.NONE, out Options.PRINT_VERSION, N_("Print version info and exit"), null },
+        { null }
+    };
+
+    public static void main (string [] args) {
+        X.init_threads ();
+
+        var context = new OptionContext ("Audience");
+        context.add_main_entries (app_options, null);
+        context.add_group (Gtk.get_option_group (false));
+
+        try {
+            context.parse (ref args);
+        } catch (Error e) {
+            warning (e.message);
+        }
+
+        if (Options.PRINT_VERSION) {
+            stdout.printf ("Audience %s\n", Constants.VERSION);
+            stdout.printf ("Copyright 2011-2015 Audience Developers.\n");
+
+            return;
+        }
+
+        var err = GtkClutter.init (ref args);
+        if (err != Clutter.InitError.SUCCESS) {
+            error ("Could not initalize clutter! "+err.to_string ());
+        }
+
+        Gst.init (ref args);
+        Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
+
+        var app = Audience.App.get_instance ();
+        app.run (args);
+    }
+
     public class App : Granite.Application {
 
         /**
@@ -60,7 +101,7 @@
             build_version = Constants.VERSION;
             build_version_info = Constants.VERSION_INFO;
 
-            app_years = "2011-2014";
+            app_years = "2011-2015";
             app_icon = "audience";
             app_launcher = "audience.desktop";
             application_id = "net.launchpad.audience";
@@ -111,7 +152,6 @@
         public App () {
             Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
 
-            Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
             this.flags |= GLib.ApplicationFlags.HANDLES_OPEN;
 
             repeat = false;
@@ -835,18 +875,3 @@
         }
     }
 }
-
-public static void main (string [] args) {
-    X.init_threads ();
-
-    var err = GtkClutter.init (ref args);
-    if (err != Clutter.InitError.SUCCESS) {
-        error ("Could not initalize clutter! "+err.to_string ());
-    }
-
-    Gst.init (ref args);
-
-    var app = Audience.App.get_instance ();
-
-    app.run (args);
-}