[balsa: 1/2] main: Behave as documented

[Peter Bloomfield <peterb src gnome org>]

commit ba8a07fa165fd85e1ef9f2acc5089b7889820027
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Fri Feb 21 14:16:58 2020 -0500

    main: Behave as documented
    
    The man page says that Balsa exits immediately if given
    --version, --help, or --get-stats, so it should.
    
    Also, if it is given more than one of those options, it should
    respond to all of them.
    
    * src/main.c
      (config_init): is no longer called with a boolean argument;
      (balsa_startup_cb): do not use cmd_get_stats, it has not been set;
      (balsa_shutdown_cb): go through the shut-down process only if
        the main window has been created; it does not get created
        when Balsa exits immediately after responding to those
        options;
      (parse_options): respond to both --help and --version, if
        requested;
      (balsa_command_line_cb): activate Balsa only if not exiting
        immediately;
      (balsa_get_stats): coding style;
      (scan_mailboxes_idle_cb): ditto.

 ChangeLog  | 24 ++++++++++++++++++
 src/main.c | 83 +++++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 71 insertions(+), 36 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 24ce23ab6..e9875fc67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2020-02-21  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       main: Behave as documented
+
+       The man page says that Balsa exits immediately if given
+       --version, --help, or --get-stats, so it should.
+
+       Also, if it is given more than one of those options, it should
+       respond to all of them.
+
+       * src/main.c
+         (config_init): is no longer called with a boolean argument;
+         (balsa_startup_cb): do not use cmd_get_stats, it has not been set;
+         (balsa_shutdown_cb): go through the shut-down process only if
+           the main window has been created; it does not get created
+           when Balsa exits immediately after responding to those
+           options;
+         (parse_options): respond to both --help and --version, if
+           requested;
+         (balsa_command_line_cb): activate Balsa only if not exiting
+           immediately;
+         (balsa_get_stats): coding style;
+         (scan_mailboxes_idle_cb): ditto.
+
 2020-02-18  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Use a GThreadPool to open mailboxes
diff --git a/src/main.c b/src/main.c
index 69ee0e45c..53b80356f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -134,9 +134,9 @@ check_special_mailboxes(void)
 }
 
 static void
-config_init(gboolean check_only)
+config_init(void)
 {
-    while(!config_load() && !check_only) {
+    while (!config_load()) {
        balsa_init_begin();
         config_defclient_save();
     }
@@ -193,17 +193,21 @@ initial_open_inbox()
 static void
 balsa_get_stats(long *unread, long *unsent)
 {
-
     if (balsa_app.inbox && libbalsa_mailbox_open(balsa_app.inbox, NULL)) {
         /* set threading type to load messages */
         libbalsa_mailbox_set_threading(balsa_app.inbox);
         *unread = libbalsa_mailbox_get_unread_messages(balsa_app.inbox);
         libbalsa_mailbox_close(balsa_app.inbox, FALSE);
-    } else *unread = -1;
+    } else {
+        *unread = -1;
+    }
+
     if (balsa_app.outbox && libbalsa_mailbox_open(balsa_app.outbox, NULL)){
         *unsent = libbalsa_mailbox_total_messages(balsa_app.outbox);
         libbalsa_mailbox_close(balsa_app.outbox, FALSE);
-    } else *unsent = -1;
+    } else {
+        *unsent = -1;
+    }
 }
 
 static gboolean
@@ -299,7 +303,7 @@ scan_mailboxes_idle_cb()
                                                             FALSE));
     }
 
-    if(cmd_get_stats) {
+    if (cmd_get_stats) {
         long unread, unsent;
         balsa_get_stats(&unread, &unsent);
         printf("Unread: %ld Unsent: %ld\n", unread, unsent);
@@ -544,23 +548,12 @@ balsa_startup_cb(GApplication *application,
     }
 #endif
 
-    /* checking for valid config files */
-    config_init(cmd_get_stats);
-
     default_icon = balsa_pixmap_finder("balsa_icon.png");
-    if(default_icon) { /* may be NULL for developer installations */
+    if (default_icon) { /* may be NULL for developer installations */
         gtk_window_set_default_icon_from_file(default_icon, NULL);
         g_free(default_icon);
     }
 
-    if (cmd_get_stats) {
-        long unread, unsent;
-        balsa_get_stats(&unread, &unsent);
-        printf("Unread: %ld Unsent: %ld\n", unread, unsent);
-        g_application_quit(G_APPLICATION(balsa_app.application));
-        return;
-    }
-
     balsa_app.has_openpgp =
         libbalsa_gpgme_check_crypto_engine(GPGME_PROTOCOL_OpenPGP);
     balsa_app.has_smime =
@@ -572,6 +565,9 @@ balsa_startup_cb(GApplication *application,
 static void
 balsa_shutdown_cb(void)
 {
+    if (balsa_app.main_window == NULL)
+        return;
+
     balsa_app_destroy();
 
     libbalsa_conf_drop_all();
@@ -696,24 +692,28 @@ parse_options(int                       argc,
         g_error_free(error);
     }
 
-    if (!rc) {
+    if (rc) {
+        if (help) {
+            gchar *text;
+
+            text = g_option_context_get_help(context, FALSE, NULL);
+            g_application_command_line_print(command_line, "%s", text);
+            g_free(text);
+            status = 2;
+        }
+
+        if (version) {
+            g_application_command_line_print(command_line,
+                                             "Balsa email client %s\n",
+                                             BALSA_VERSION);
+            status = 2;
+        }
+    } else {
         /* Some other bad option */
         g_application_command_line_printerr(command_line, "%s\n",
                                             error->message);
         g_error_free(error);
         status = 1;
-    } else if (help) {
-        gchar *text;
-
-        text = g_option_context_get_help(context, FALSE, NULL);
-        g_application_command_line_print(command_line, "%s", text);
-        g_free(text);
-        status = 2;
-    } else if (version) {
-        g_application_command_line_print(command_line,
-                                         "Balsa email client %s\n",
-                                         BALSA_VERSION);
-        status = 2;
     }
 
     if (remaining_args != NULL) {
@@ -767,8 +767,8 @@ handle_remote(int argc, char **argv,
 
 static int
 balsa_command_line_cb(GApplication            * application,
-                GApplicationCommandLine * command_line,
-                gpointer                  user_data)
+                      GApplicationCommandLine * command_line,
+                      gpointer                  user_data)
 {
     gchar **args, **argv;
     gint argc;
@@ -783,16 +783,27 @@ balsa_command_line_cb(GApplication            * application,
     /* The signal is emitted when the GApplication is run, but is always
      * handled by the primary instance of Balsa. */
     status = parse_options(argc, argv, command_line);
-    if (status == 0) {
+    if (status == 0 || status == 2) {
         if (g_application_command_line_get_is_remote(command_line)) {
             /* A remote instance caused the emission; skip start-up, just
              * handle the command line. */
             handle_remote(argc, argv, command_line);
         } else {
-            g_application_activate(application);
+            if (cmd_get_stats) {
+                long unread, unsent;
+
+                balsa_app.inbox = libbalsa_mailbox_new_from_config("mailbox-Inbox", FALSE);
+                balsa_app.outbox = libbalsa_mailbox_new_from_config("mailbox-Outbox", FALSE);
+                balsa_get_stats(&unread, &unsent);
+                printf("Unread: %ld Unsent: %ld\n", unread, unsent);
+            } else if (status == 0) {
+                /* checking for valid config files */
+                config_init();
+                g_application_activate(application);
+            }
         }
-    } else if (status == 2) /* handled a "help" or "version" request */
         status = 0;
+    }
 
     g_free(argv);
     g_strfreev(args);