[latexila/gnome-3] Main: remove Unique stuff and code clean-up

[SÃbastien Wilmet <swilmet src gnome org>]

commit 7859086c907484afc72fb36b7ed7603e2341b8d3
Author: SÃbastien Wilmet <swilmet src gnome org>
Date:   Mon Apr 2 04:44:42 2012 +0200

    Main: remove Unique stuff and code clean-up

 src/main.vala |  135 +++++++++++++++++++++------------------------------------
 1 files changed, 50 insertions(+), 85 deletions(-)
---
diff --git a/src/main.vala b/src/main.vala
index 7972328..4dd9ff3 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -1,7 +1,7 @@
 /*
  * This file is part of LaTeXila.
  *
- * Copyright  2010-2011 SÃbastien Wilmet
+ * Copyright  2010-2012 SÃbastien Wilmet
  *
  * LaTeXila is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,35 +19,36 @@
 
 using Gtk;
 
-bool option_version;
-bool option_new_document;
-bool option_new_window;
+bool _option_version;
+bool _option_new_document;
+bool _option_new_window;
 
 [CCode (array_length = false, array_null_terminated = true)]
-string[] remaining_args;
+string[] _remaining_args;
 
-const OptionEntry[] options =
+const OptionEntry[] _options =
 {
-    { "version", 'V', 0, OptionArg.NONE, ref option_version,
-    N_("Show the application's version"), null },
+    {"version", 'V', 0, OptionArg.NONE, ref _option_version,
+        N_("Show the application's version"), null },
 
-    { "new-document", 'n', 0, OptionArg.NONE, ref option_new_document,
-    N_("Create new document"), null },
+    { "new-document", 'n', 0, OptionArg.NONE, ref _option_new_document,
+        N_("Create new document"), null },
 
-    { "new-window", '\0', 0, OptionArg.NONE, ref option_new_window,
-    N_("Create a new top-level window in an existing instance of LaTeXila"), null },
+    { "new-window", 0, 0, OptionArg.NONE, ref _option_new_window,
+        N_("Create a new top-level window in an existing instance of LaTeXila"), null },
 
-    { "", '\0', 0, OptionArg.FILENAME_ARRAY, ref remaining_args,
-    null, "[FILE...]" },
+    { "", 0, 0, OptionArg.FILENAME_ARRAY, ref _remaining_args,
+        null, "[FILE...]" },
 
     { null }
 };
 
-int main (string[] args)
+private void check_xdg_data_dirs ()
 {
-    /* for GSettings: verify system data dirs */
+    // GSettings looks for compiled schemas in locations specified by the XDG_DATA_DIRS
+    // environment variable.
 
-    // We don't use Environment.get_system_data_dirs () because this function store the
+    // Environment.get_system_data_dirs() is not used because this function store the
     // value in a cache. If we change the value of the environment variable, the cache is
     // not modified...
     string? data_dirs_env = Environment.get_variable ("XDG_DATA_DIRS");
@@ -60,18 +61,20 @@ int main (string[] args)
         Environment.set_variable ("XDG_DATA_DIRS",
             Config.SCHEMA_DIR + ":" + data_dirs_env, true);
     }
+}
 
-    /* internationalisation */
+private void init_i18n ()
+{
     Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALE_DIR);
     Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
     Intl.textdomain (Config.GETTEXT_PACKAGE);
+}
 
-    Gtk.init (ref args);
-
-    /* command line options */
+private void parse_cmd_line_options (string[] args)
+{
     OptionContext context =
         new OptionContext (_("- Integrated LaTeX Environment for GNOME"));
-    context.add_main_entries (options, Config.GETTEXT_PACKAGE);
+    context.add_main_entries (_options, Config.GETTEXT_PACKAGE);
     context.add_group (Gtk.get_option_group (false));
 
     try
@@ -81,72 +84,24 @@ int main (string[] args)
     catch (OptionError e)
     {
         warning ("%s", e.message);
-        stderr.printf (_("Run '%s --help' to see a full list of available command line options.\n"),
+        stderr.printf (
+            _("Run '%s --help' to see a full list of available command line options.\n"),
             args[0]);
-        return 1;
+
+        Process.exit (1);
     }
 
-    if (option_version)
+    if (_option_version)
     {
         stdout.printf ("%s %s\n", Config.APP_NAME, Config.APP_VERSION);
-        return 0;
+        Process.exit (0);
     }
+}
 
-    /* prepare commands */
-//    bool command_open = false;
-//    Unique.MessageData data = new Unique.MessageData ();
-//
-//    if (remaining_args.length != 0)
-//    {
-//        command_open = true;
-//
-//        // since remaining_args.length == 0, we use a dynamic array
-//        string[] uris = {};
-//        foreach (string arg in remaining_args)
-//            // The command line argument can be absolute or relative.
-//            // With URI's, that's always absolute, so no problem.
-//            uris += File.new_for_path (arg).get_uri ();
-//
-//        data.set_uris (uris);
-//    }
-//
-//    Unique.App app = new Unique.App ("org.gnome.latexila", null);
-//    app.add_command ("new_window", Latexila.NEW_WINDOW);
-//
-//    if (app.is_running)
-//    {
-//        /* send commands */
-//        bool ok = true;
-//        if (option_new_window)
-//        {
-//            Unique.Response resp = app.send_message (Latexila.NEW_WINDOW, null);
-//            ok = resp == Unique.Response.OK;
-//        }
-//        if (ok && command_open)
-//        {
-//            Unique.Response resp = app.send_message (Unique.Command.OPEN, data);
-//            ok = resp == Unique.Response.OK;
-//        }
-//        if (ok && option_new_document)
-//        {
-//            Unique.Response resp = app.send_message (Unique.Command.NEW, null);
-//            ok = resp == Unique.Response.OK;
-//        }
-//        if (! option_new_window && ! command_open && ! option_new_document)
-//        {
-//            Unique.Response resp = app.send_message (Unique.Command.ACTIVATE, null);
-//            ok = resp == Unique.Response.OK;
-//        }
-//
-//        if (! ok)
-//            error ("Error: communication with first instance of LaTeXila failed\n");
-//        return 0;
-//    }
-
-    /* start a new application */
+private void reopen_files ()
+{
     Latexila latexila = Latexila.get_default ();
 
-    /* reopen files on startup */
     GLib.Settings editor_settings =
         new GLib.Settings ("org.gnome.latexila.preferences.editor");
     if (editor_settings.get_boolean ("reopen-files"))
@@ -157,15 +112,25 @@ int main (string[] args)
         string[] uris = window_settings.get_strv ("documents");
         latexila.open_documents (uris);
     }
+}
+
+int main (string[] args)
+{
+    check_xdg_data_dirs ();
+    init_i18n ();
+
+    Gtk.init (ref args);
+
+    parse_cmd_line_options (args);
+
+    // Create the application instance
+    Latexila latexila = Latexila.get_default ();
+
+    reopen_files ();
 
-    /* execute commands */
-    // the --new-window option have no effect in this case
-//    if (command_open)
-//        latexila.open_documents (data.get_uris ());
-    if (option_new_document)
+    if (_option_new_document)
         latexila.create_document ();
 
-//    app.message_received.connect (latexila.message);
     Gtk.main ();
 
     return 0;