[gnome-mines] Revert "Add --version command-line option."
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-mines] Revert "Add --version command-line option."
- Date: Sat, 13 Sep 2014 17:15:26 +0000 (UTC)
commit 8e28890fdaf74c56af7f21bc43869bb992cb0b00
Author: Robert Roth <robert roth off gmail com>
Date: Sat Sep 13 20:14:38 2014 +0300
Revert "Add --version command-line option."
This reverts commit 3ad0a5eec54dbe3e1cea836c94166cdc779482d9.
configure.ac | 2 +-
src/gnome-mines.vala | 41 +++++++++++++++++------------------------
2 files changed, 18 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9312546..b0bab8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl ###########################################################################
dnl Dependencies
dnl ###########################################################################
-GLIB_REQUIRED=2.40.0
+GLIB_REQUIRED=2.36.0
GTK_REQUIRED=3.12
RSVG_REQUIRED=2.32.0
diff --git a/src/gnome-mines.vala b/src/gnome-mines.vala
index 096f1e9..08bf61c 100644
--- a/src/gnome-mines.vala
+++ b/src/gnome-mines.vala
@@ -73,12 +73,6 @@ public class Mines : Gtk.Application
private Gtk.AspectFrame custom_game_screen;
private bool is_new_game_screen;
- private const OptionEntry[] option_entries =
- {
- { "version", 'v', 0, OptionArg.NONE, null, N_("Print release version and exit"), null },
- { null }
- };
-
private const GLib.ActionEntry[] action_entries =
{
{ "new-game", new_game_cb },
@@ -93,8 +87,6 @@ public class Mines : Gtk.Application
public Mines ()
{
Object (application_id: "org.gnome.mines", flags: ApplicationFlags.FLAGS_NONE);
-
- add_main_option_entries (option_entries);
}
protected override void startup ()
@@ -370,22 +362,9 @@ public class Mines : Gtk.Application
settings.apply ();
}
- protected override int handle_local_options (GLib.VariantDict options)
- {
- if (options.contains ("version"))
- {
- /* NOTE: Is not translated so can be easily parsed */
- stderr.printf ("%1$s %2$s\n", "gnome-mines", VERSION);
- return Posix.EXIT_SUCCESS;
- }
-
- /* Activate */
- return -1;
- }
-
- protected override void activate ()
+ public override void activate ()
{
- window.present ();
+ window.show ();
}
private bool view_button_press_event (Gtk.Widget widget, Gdk.EventButton event)
@@ -819,7 +798,21 @@ public class Mines : Gtk.Application
Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
Intl.textdomain (GETTEXT_PACKAGE);
+ var context = new OptionContext (null);
+ context.set_translation_domain (GETTEXT_PACKAGE);
+ context.add_group (Gtk.get_option_group (true));
+
+ try
+ {
+ context.parse (ref args);
+ }
+ catch (Error e)
+ {
+ stderr.printf ("%s\n", e.message);
+ return Posix.EXIT_FAILURE;
+ }
+
var app = new Mines ();
- return app.run (args);
+ return app.run ();
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]