Commit d80f3977 authored by Lubomir Rintel's avatar Lubomir Rintel

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).
parent fbf23005
Pipeline #36580 passed with stages
in 4 minutes and 22 seconds
NetworkManager-vpnc-1.2.8 (not released yet)
Overview of changes since NetworkManager-vpnc-1.2.6
* 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.
Overview of changes since NetworkManager-vpnc-1.2.4
......@@ -17,7 +17,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 - 2011 Red Hat, Inc.
* (C) Copyright 2004 - 2018 Red Hat, Inc.
#include "nm-default.h"
......@@ -221,6 +221,8 @@ std_ask_user (const char *vpn_name,
g_return_val_if_fail (out_new_password != NULL, FALSE);
g_return_val_if_fail (out_new_group_password != 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 */
......@@ -447,10 +449,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 ("- vpnc auth dialog");
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
g_option_context_add_group (context, gtk_get_option_group (FALSE));
if (!g_option_context_parse (context, &argc, &argv, &error)) {
fprintf (stderr, "Error parsing options: %s\n", error->message);
g_error_free (error);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment