[NetworkManager-fortisslvpn] auth-dialog: don't connect to Gtk+ display until necessary

[Lubomir Rintel <lkundrak src gnome org>]

commit 0752b8739beccc9b1670e42a79fd4569221db1be
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Thu Oct 18 16:49:08 2018 +0200

    auth-dialog: don't connect to Gtk+ display until necessary
    
    In the external UI mode we may end up not needing a connection to the
    display server at all.
    
    This splits the parsing of Gtk+ command line arguments from connection
    to the display. This also fixes the --help output to actually include
    the Gtk+ arguments (such as --display).

 NEWS               | 3 +++
 auth-dialog/main.c | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index 6001d98..4c4c65a 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@ Overview of changes since NetworkManager-fortisslvpn-1.2.8
   It can be enabled by passing --with-libnm-glib to configure script.
   Nobody should need it by now. Users that still use this are encouraged
   to let us know before the libnm-glib support is removed for good.
+* The auth helper in external UI mode can now be run without a display
+  server. Future nmcli version will utilize this for handling the
+  secrets without a graphical desktop.
 
 ==========================================================
 NetworkManager-fortisslvpn-1.2.8
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 0f1b55f..45ddf35 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * (C) Copyright 2008 - 2011 Red Hat, Inc.
- * (C) Copyright 2015,2017 Lubomir Rintel
+ * (C) Copyright 2015,2017,2018 Lubomir Rintel
  */
 
 #include "nm-default.h"
@@ -178,6 +178,7 @@ get_secrets (const char *vpn_uuid,
                return TRUE;
        }
 
+       gtk_init (NULL, NULL);
 
        dialog = (NMAVpnPasswordDialog *) nma_vpn_password_dialog_new (_("Authenticate VPN"), prompt, NULL);
 
@@ -265,10 +266,9 @@ main (int argc, char *argv[])
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
 
-       gtk_init (&argc, &argv);
-
        context = g_option_context_new ("- fortisslvpn auth dialog");
        g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+       g_option_context_add_group (context, gtk_get_option_group (FALSE));
        g_option_context_parse (context, &argc, &argv, NULL);
        g_option_context_free (context);