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

[Beniamino Galvani <bgalvani src gnome org>]

commit 616fc944d87a51cb027f67bc616d91ab3a626082
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).
    
    https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/merge_requests/10

 NEWS               | 9 +++++++++
 auth-dialog/main.c | 7 ++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index 3e8c971..7af39d6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+=======================================================
+NetworkManager-openvpn-1.8.12 (not released yet)
+Overview of changes since NetworkManager-openvpn-1.8.10
+=======================================================
+
+* 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-openvpn-1.8.10
 Overview of changes since NetworkManager-openvpn-1.8.8
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 41b6384..d5b4966 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -18,7 +18,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2004 - 2008 Red Hat, Inc.
+ * (C) Copyright 2004 - 2020 Red Hat, Inc.
  *               2005 Tim Niemueller [www.niemueller.de]
  */
 
@@ -231,6 +231,8 @@ std_ask_user (const char *vpn_name,
        g_return_val_if_fail (out_new_certpass != NULL, FALSE);
        g_return_val_if_fail (out_new_proxypass != NULL, FALSE);
 
+       gtk_init (NULL, NULL);
+
        dialog = NMA_VPN_PASSWORD_DIALOG (nma_vpn_password_dialog_new (_("Authenticate VPN"), prompt, NULL));
 
        /* pre-fill dialog with existing passwords */
@@ -475,10 +477,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 ("- openvpn 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);