msgstr ""
"Project-Id-Version: NetworkManager-strongswan\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-18 18:12+0200\n"
+"POT-Creation-Date: 2022-04-19 17:33+0200\n"
"PO-Revision-Date: 2019-12-18 17:10+0100\n"
"Last-Translator: Tobias Brunner\n"
"Language-Team: de <info@strongswan.org>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../properties/nm-strongswan.c:43
+#: ../properties/nm-strongswan.c:35
msgid "IPsec/IKEv2 (strongswan)"
msgstr "IPsec/IKEv2 (strongswan)"
-#: ../properties/nm-strongswan.c:44
+#: ../properties/nm-strongswan.c:36
msgid "IPsec with the IKEv2 key exchange protocol."
msgstr "IPsec mit dem IKEv2 Protokoll."
-#: ../properties/nm-strongswan.c:367
+#: ../properties/nm-strongswan.c:273
+msgid "(None)"
+msgstr "(Nicht festgelegt)"
+
+#: ../properties/nm-strongswan.c:438
msgid "EAP (Username/Password)"
msgstr "EAP (Benutzername/Passwort)"
-#: ../properties/nm-strongswan.c:368
+#: ../properties/nm-strongswan.c:439
msgid "Certificate"
msgstr "Zertifikat"
-#: ../properties/nm-strongswan.c:369
+#: ../properties/nm-strongswan.c:440
msgid "EAP-TLS"
msgstr "EAP-TLS"
-#: ../properties/nm-strongswan.c:370
+#: ../properties/nm-strongswan.c:441
msgid "Pre-shared key"
msgstr "Pre-shared Key"
-#: ../properties/nm-strongswan.c:396
+#: ../properties/nm-strongswan.c:467
msgid "Certificate/private key"
msgstr "Zertifikat/Privater Schlüssel"
-#: ../properties/nm-strongswan.c:397
+#: ../properties/nm-strongswan.c:468
msgid "Certificate/ssh-agent"
msgstr "Zertifikat/ssh-agent"
-#: ../properties/nm-strongswan.c:398
+#: ../properties/nm-strongswan.c:469
msgid "Smartcard"
msgstr "Smartcard"
#: ../properties/nm-strongswan-dialog.ui.h:1
+msgid "Choose a server or CA certificate…"
+msgstr "Server- oder CA-Zertifikat auswählen…"
+
+#: ../properties/nm-strongswan-dialog.ui.h:2
+msgid "_Cancel"
+msgstr "Abbre_chen"
+
+#: ../properties/nm-strongswan-dialog.ui.h:3
+msgid "_Select"
+msgstr "_Auswählen"
+
+#: ../properties/nm-strongswan-dialog.ui.h:4
msgid "<b>Server</b>"
msgstr "<b>Server</b>"
-#: ../properties/nm-strongswan-dialog.ui.h:2
+#: ../properties/nm-strongswan-dialog.ui.h:5
msgid "_Address:"
msgstr "_Adresse:"
-#: ../properties/nm-strongswan-dialog.ui.h:3
+#: ../properties/nm-strongswan-dialog.ui.h:6
msgid "An IP address or hostname of the VPN server."
msgstr "Eine IP-Adresse oder ein Hostname des VPN Servers."
-#: ../properties/nm-strongswan-dialog.ui.h:4
+#: ../properties/nm-strongswan-dialog.ui.h:7
msgid "C_ertificate:"
msgstr "Z_ertifikat:"
-#: ../properties/nm-strongswan-dialog.ui.h:5
+#: ../properties/nm-strongswan-dialog.ui.h:8
msgid ""
"Server or CA certificate to use for server authentication. If none is "
"specified, pre-installed CA certificates are used."
"Server- oder CA-Zertifikat für die Authentisierung des Servers. Ohne Angabe "
"eines Zertifikates werden die CA-Zertifikate des Systems verwendet."
-#: ../properties/nm-strongswan-dialog.ui.h:6
+#: ../properties/nm-strongswan-dialog.ui.h:9
msgid "_Identity:"
msgstr "_Identität:"
-#: ../properties/nm-strongswan-dialog.ui.h:7
+#: ../properties/nm-strongswan-dialog.ui.h:10
msgid ""
"Defaults to the server address or the server certificate's subject DN (if "
"configured). Custom values are explicitly sent to the server and enforced "
"Zertifikats (falls konfiguriert). Eigene Werte werden explizit an den Server "
"gesendet und während der Authentifizierung erzwungen."
-#: ../properties/nm-strongswan-dialog.ui.h:8
+#: ../properties/nm-strongswan-dialog.ui.h:11
msgid "(Defaults to address or certificate subject)"
msgstr "(Standardwert ist die Adresse oder die Zertifikats-Identität)"
-#: ../properties/nm-strongswan-dialog.ui.h:9
+#: ../properties/nm-strongswan-dialog.ui.h:12
msgid "<b>Client</b>"
msgstr "<b>Client</b>"
-#: ../properties/nm-strongswan-dialog.ui.h:10
+#: ../properties/nm-strongswan-dialog.ui.h:13
msgid "Au_thentication:"
msgstr "Au_thentisierung:"
-#: ../properties/nm-strongswan-dialog.ui.h:11
+#: ../properties/nm-strongswan-dialog.ui.h:14
msgid "Ce_rtificate:"
msgstr "Ze_rtifikat:"
-#: ../properties/nm-strongswan-dialog.ui.h:12
+#: ../properties/nm-strongswan-dialog.ui.h:15
msgid "Certificate _file:"
msgstr "Z_ertifikatsdatei:"
-#: ../properties/nm-strongswan-dialog.ui.h:13
+#: ../properties/nm-strongswan-dialog.ui.h:16
msgid "Client certificate to use for client authentication."
msgstr "Zertifikat des Clients für dessen Authentisierung."
-#: ../properties/nm-strongswan-dialog.ui.h:14
+#: ../properties/nm-strongswan-dialog.ui.h:17
msgid "Private _key:"
msgstr "Privater _Schlüssel:"
-#: ../properties/nm-strongswan-dialog.ui.h:15
+#: ../properties/nm-strongswan-dialog.ui.h:18
msgid ""
"Private key to use for client authentication. This key has to match the "
"certificates public key and may be encrypted."
"Privater Schlüssel für die Authentisierung des Clients. Dieser Schlüssel "
"muss zum konfigurierten Zertifikat passen und kann verschlüsselt sein."
-#: ../properties/nm-strongswan-dialog.ui.h:16
+#: ../properties/nm-strongswan-dialog.ui.h:19
msgid "_Username:"
msgstr "_Benutzername:"
-#: ../properties/nm-strongswan-dialog.ui.h:17
+#: ../properties/nm-strongswan-dialog.ui.h:20
msgid ""
"The username (EAP identity) to use for authentication against the server."
msgstr ""
"Benutzername/EAP-Identität für die Authentisierung gegenüber dem Server."
-#: ../properties/nm-strongswan-dialog.ui.h:18
+#: ../properties/nm-strongswan-dialog.ui.h:21
msgid "_Password:"
msgstr "_Passwort:"
-#: ../properties/nm-strongswan-dialog.ui.h:19
+#: ../properties/nm-strongswan-dialog.ui.h:22
msgid ""
"The password to use for authentication against the server (min. 20 "
"characters for PSKs)."
"Das Passwort für die Authentisierung gegenüber dem Server (min. 20 Zeichen "
"für PSKs)."
-#: ../properties/nm-strongswan-dialog.ui.h:20
+#: ../properties/nm-strongswan-dialog.ui.h:23
msgid "(Use icon to change password storage policy)"
msgstr "(Icon verwenden, um Passwort-Richtlinie zu ändern)"
-#: ../properties/nm-strongswan-dialog.ui.h:21
+#: ../properties/nm-strongswan-dialog.ui.h:24
msgid "_Show password"
msgstr "Passwort _anzeigen"
-#: ../properties/nm-strongswan-dialog.ui.h:22
+#: ../properties/nm-strongswan-dialog.ui.h:25
msgid "I_dentity:"
msgstr "I_dentität:"
-#: ../properties/nm-strongswan-dialog.ui.h:23
+#: ../properties/nm-strongswan-dialog.ui.h:26
msgid ""
"Defaults to the username (EAP), the client certificate's subject DN "
"(certificate/EAP-TLS), or the IP address (PSK). Custom values may be used if "
"Zertifikats (Zertifikat/EAP-TLS) oder die IP-Adresse (PSK). Eigene Werte "
"können verwendet werden, falls der Server diese erwartet/benötigt."
-#: ../properties/nm-strongswan-dialog.ui.h:24
+#: ../properties/nm-strongswan-dialog.ui.h:27
msgid "(Defaults to username, certificate subject or IP address)"
msgstr "(Standardwert ist der Benutzername, die Zertifikats-ID oder die IP)"
-#: ../properties/nm-strongswan-dialog.ui.h:25
+#: ../properties/nm-strongswan-dialog.ui.h:28
msgid "Request an _inner IP address"
msgstr "_Innere IP-Adresse beziehen"
-#: ../properties/nm-strongswan-dialog.ui.h:26
+#: ../properties/nm-strongswan-dialog.ui.h:29
msgid ""
"The server may provide addresses from a pool to use for communication in the "
"VPN. Check to request such an address."
"Kommunikation im dahinterliegenden Netz verwenden kann. Aktivieren, um eine "
"solche Adresse zu beziehen."
-#: ../properties/nm-strongswan-dialog.ui.h:27
+#: ../properties/nm-strongswan-dialog.ui.h:30
msgid "En_force UDP encapsulation"
msgstr "Erzwingen einer zusätzlichen Einbettung der Datenpakete in _UDP"
-#: ../properties/nm-strongswan-dialog.ui.h:28
+#: ../properties/nm-strongswan-dialog.ui.h:31
msgid ""
"Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT "
"situation is detected might help in such cases."
"erzwingen einer zustzlichen Einbettung in UDP, auch wenn kein NAT-Router "
"detektiert wurde, kann in solchen Situationen hilfreich sein."
-#: ../properties/nm-strongswan-dialog.ui.h:29
+#: ../properties/nm-strongswan-dialog.ui.h:32
msgid "Use IP c_ompression"
msgstr "IP-Pakete k_omprimieren"
-#: ../properties/nm-strongswan-dialog.ui.h:30
+#: ../properties/nm-strongswan-dialog.ui.h:33
msgid ""
"IPComp compresses raw IP packets before they get encrypted. This saves some "
"bandwidth, but uses more processing power."
"IPComp komprimiert IP-Pakete, bevor sie verschlüsselt werden. Diese Option "
"kann Bandbreite sparen, benötigt jedoch zusätzliche Rechenleistung."
-#: ../properties/nm-strongswan-dialog.ui.h:31
+#: ../properties/nm-strongswan-dialog.ui.h:34
msgid "Server _port:"
msgstr "Server-_Port:"
-#: ../properties/nm-strongswan-dialog.ui.h:32
+#: ../properties/nm-strongswan-dialog.ui.h:35
msgid ""
"Custom server port to connect to. Defaults to UDP port 500, which is "
"followed by a switch to port 4500 after the first exchange."
"Server-Port zu dem verbunden wird. Ohne Konfiguration wird UDP-Port 500 "
"verwendet, mit einem Wechsel auf Port 4500 nach der ersten Nachricht."
-#: ../properties/nm-strongswan-dialog.ui.h:33
+#: ../properties/nm-strongswan-dialog.ui.h:36
msgid "(Defaults to UDP 500/4500)"
msgstr "(Standardwert ist UDP 500/4500)"
-#: ../properties/nm-strongswan-dialog.ui.h:34
+#: ../properties/nm-strongswan-dialog.ui.h:37
msgid "Options"
msgstr "Optionen"
-#: ../properties/nm-strongswan-dialog.ui.h:35
+#: ../properties/nm-strongswan-dialog.ui.h:38
msgid "_Enable custom algorithm proposals"
msgstr "_Eigene Algorithmen verwenden"
-#: ../properties/nm-strongswan-dialog.ui.h:36
+#: ../properties/nm-strongswan-dialog.ui.h:39
msgid "_IKE:"
msgstr "_IKE:"
-#: ../properties/nm-strongswan-dialog.ui.h:37
+#: ../properties/nm-strongswan-dialog.ui.h:40
msgid "A list of proposals for IKE separated by \";\""
msgstr "Eine Liste von Proposals für IKE getrennt mit \";\""
-#: ../properties/nm-strongswan-dialog.ui.h:38
+#: ../properties/nm-strongswan-dialog.ui.h:41
msgid "_ESP:"
msgstr "_ESP:"
-#: ../properties/nm-strongswan-dialog.ui.h:39
+#: ../properties/nm-strongswan-dialog.ui.h:42
msgid "A list of proposals for ESP separated by \";\""
msgstr "Eine Liste von Proposals für ESP getrennt mit \";\""
-#: ../properties/nm-strongswan-dialog.ui.h:40
+#: ../properties/nm-strongswan-dialog.ui.h:43
msgid "Algorithms"
msgstr "Algorithmen"
+#: ../properties/nm-strongswan-dialog.ui.h:44
+msgid "Choose a client certificate…"
+msgstr "Client-Zertifikat auswählen…"
+
+#: ../properties/nm-strongswan-dialog.ui.h:45
+msgid "Choose a private key…"
+msgstr "Privaten Schlüssel auswählen…"
+
#: ../auth-dialog/main.c:137
#, c-format
msgid "EAP password required to establish VPN connection '%s'."
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<interface>
- <requires lib="gtk+" version="3.2"/>
+ <requires lib="gtk+" version="3.10"/>
+ <object class="GtkFileChooserDialog" id="certificate-chooser">
+ <property name="can-focus">False</property>
+ <property name="title" translatable="yes">Choose a server or CA certificate…</property>
+ <property name="modal">True</property>
+ <property name="type-hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox">
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox">
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
+ <child>
+ <object class="GtkButton" id="certificate-chooser-cancel">
+ <property name="label" translatable="yes">_Cancel</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="certificate-chooser-accept">
+ <property name="label" translatable="yes">_Select</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
+ <style>
+ <class name="default"/>
+ <class name="suggested-action"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">certificate-chooser-cancel</action-widget>
+ <action-widget response="-3">certificate-chooser-accept</action-widget>
+ </action-widgets>
+ </object>
<object class="GtkBox" id="strongswan-vbox">
<property name="visible">True</property>
<property name="can-focus">False</property>
</packing>
</child>
<child>
- <object class="GtkFileChooserButton" id="certificate-button">
+ <object class="GtkButton" id="certificate-button">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">Server or CA certificate to use for server authentication. If none is specified, pre-installed CA certificates are used.</property>
- <property name="hexpand">True</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <child>
+ <object class="GtkLabel" id="certificate-button-label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">document-open-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkFileChooserButton" id="usercert-button">
+ <object class="GtkButton" id="usercert-button">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">Client certificate to use for client authentication.</property>
- <property name="hexpand">True</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <child>
+ <object class="GtkLabel" id="usercert-button-label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">document-open-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkFileChooserButton" id="userkey-button">
+ <object class="GtkButton" id="userkey-button">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">Private key to use for client authentication. This key has to match the certificates public key and may be encrypted.</property>
- <property name="hexpand">True</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <child>
+ <object class="GtkLabel" id="userkey-button-label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">document-open-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">1</property>
</packing>
</child>
</object>
+ <object class="GtkFileChooserDialog" id="usercert-chooser">
+ <property name="can-focus">False</property>
+ <property name="title" translatable="yes">Choose a client certificate…</property>
+ <property name="modal">True</property>
+ <property name="type-hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox">
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox">
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
+ <child>
+ <object class="GtkButton" id="usercert-chooser-cancel">
+ <property name="label" translatable="yes">_Cancel</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="usercert-chooser-accept">
+ <property name="label" translatable="yes">_Select</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
+ <style>
+ <class name="default"/>
+ <class name="suggested-action"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">usercert-chooser-cancel</action-widget>
+ <action-widget response="-3">usercert-chooser-accept</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkFileChooserDialog" id="userkey-chooser">
+ <property name="can-focus">False</property>
+ <property name="title" translatable="yes">Choose a private key…</property>
+ <property name="modal">True</property>
+ <property name="type-hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox">
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox">
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
+ <child>
+ <object class="GtkButton" id="userkey-chooser-cancel">
+ <property name="label" translatable="yes">_Cancel</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="userkey-chooser-accept">
+ <property name="label" translatable="yes">_Select</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
+ <style>
+ <class name="default"/>
+ <class name="suggested-action"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">userkey-chooser-cancel</action-widget>
+ <action-widget response="-3">userkey-chooser-accept</action-widget>
+ </action-widgets>
+ </object>
</interface>
gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(priv->builder, "esp-entry")), visible);
}
+static void
+chooser_button_update_file (GtkLabel *label, GFile *file)
+{
+ char *basename = NULL;
+
+ if (file)
+ basename = g_file_get_basename (file);
+
+ if (basename)
+ {
+ gtk_label_set_label (label, basename);
+ g_free (basename);
+ }
+ else
+ {
+ gtk_label_set_label (label, _("(None)"));
+ }
+}
+
+static void
+chooser_button_update (GtkLabel *label, GtkFileChooser *chooser)
+{
+ GFile *file;
+
+ file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (chooser));
+ chooser_button_update_file (label, file);
+ g_clear_object (&file);
+}
+
+static void
+chooser_response_cb (GtkDialog *chooser, gint response_id, gpointer user_data)
+{
+ GtkLabel *label = GTK_LABEL (user_data);
+
+ if (response_id == GTK_RESPONSE_ACCEPT)
+ {
+ chooser_button_update (label, GTK_FILE_CHOOSER (chooser));
+ }
+ gtk_widget_hide (GTK_WIDGET (chooser));
+}
+
+static void
+chooser_show_cb (GtkWidget *parent, GtkWidget *widget)
+{
+ GtkWidget *root;
+
+ root = gtk_widget_get_toplevel (parent);
+ g_return_if_fail (GTK_IS_WINDOW (root));
+
+ gtk_window_set_transient_for (GTK_WINDOW (widget), GTK_WINDOW (root));
+ gtk_widget_show (widget);
+}
+
static void
password_storage_changed_cb (GObject *entry, GParamSpec *pspec, gpointer user_data)
{
G_CALLBACK (password_storage_changed_cb), self);
}
+static void
+init_chooser (GtkBuilder *builder, NMSettingVpn *settings, const char *setting,
+ const char *chooser, const char *button, const char *label_name)
+{
+ GtkWidget *widget;
+ GtkLabel *label;
+ GFile *file = NULL;
+ const char *value;
+
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, chooser));
+ label = GTK_LABEL (gtk_builder_get_object (builder, label_name));
+ g_signal_connect_swapped (G_OBJECT (widget), "delete-event",
+ G_CALLBACK (gtk_widget_hide_on_delete), widget);
+ value = nm_setting_vpn_get_data_item (settings, setting);
+ if (value)
+ {
+ file = g_file_new_for_path (value);
+ gtk_file_chooser_set_file (GTK_FILE_CHOOSER (widget), file, NULL);
+ }
+ g_signal_connect (G_OBJECT (widget), "response",
+ G_CALLBACK (chooser_response_cb), label);
+ g_signal_connect (gtk_builder_get_object (builder, button),
+ "clicked", G_CALLBACK (chooser_show_cb), widget);
+ chooser_button_update_file (label, file);
+ g_clear_object (&file);
+}
+
static gboolean
init_plugin_ui (StrongswanPluginUiWidget *self, NMConnection *connection, GError **error)
{
gtk_entry_set_text (GTK_ENTRY (widget), value);
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "certificate-button"));
- value = nm_setting_vpn_get_data_item (settings, "certificate");
- if (value)
- gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value);
- g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (settings_changed_cb), self);
+ init_chooser (priv->builder, settings, "certificate", "certificate-chooser",
+ "certificate-button", "certificate-button-label");
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "remote-identity-entry"));
value = nm_setting_vpn_get_data_item (settings, "remote-identity");
g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self);
update_sensitive (priv);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "usercert-button"));
- value = nm_setting_vpn_get_data_item (settings, "usercert");
- if (value)
- gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value);
- g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (settings_changed_cb), self);
+ init_chooser (priv->builder, settings, "usercert", "usercert-chooser",
+ "usercert-button", "usercert-button-label");
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "userkey-button"));
- value = nm_setting_vpn_get_data_item (settings, "userkey");
- if (value)
- gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value);
- g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (settings_changed_cb), self);
+ init_chooser (priv->builder, settings, "userkey", "userkey-chooser",
+ "userkey-button", "userkey-button-label");
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "virtual-check"));
value = nm_setting_vpn_get_data_item (settings, "virtual");
nm_setting_set_secret_flags (NM_SETTING (settings), secret_key, flags, NULL);
}
-
static void
save_file_chooser (NMSettingVpn *settings, GtkBuilder *builder,
const char *name, const char *key)
{
GtkWidget *chooser;
- char *str;
+ GFile *file;
+ char *str = NULL;
chooser = GTK_WIDGET (gtk_builder_get_object (builder, name));
- str = (char *) gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
- if (str) {
+ file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (chooser));
+ if (file) {
+ str = g_file_get_path (file);
+ }
+ if (str && strlen(str)) {
nm_setting_vpn_add_data_item (settings, key, str);
}
+ g_free (str);
+ g_clear_object (&file);
}
static void
nm_setting_vpn_add_data_item (settings, "cert-source", str);
if (cert) {
- save_file_chooser (settings, builder, "usercert-button", "usercert");
+ save_file_chooser (settings, builder, "usercert-chooser", "usercert");
}
if (key) {
- save_file_chooser (settings, builder, "userkey-button", "userkey");
+ save_file_chooser (settings, builder, "userkey-chooser", "userkey");
}
}
NM_DBUS_SERVICE_STRONGSWAN, NULL);
save_entry (settings, priv->builder, "address-entry", "address");
- save_file_chooser (settings, priv->builder, "certificate-button", "certificate");
+ save_file_chooser (settings, priv->builder, "certificate-chooser", "certificate");
save_entry (settings, priv->builder, "remote-identity-entry", "remote-identity");
save_entry (settings, priv->builder, "server-port-entry", "server-port");
save_entry (settings, priv->builder, "local-identity-entry", "local-identity");
projects / thirdparty / strongswan.git / commitdiff
