[network-manager-applet/thaller/758076_ui_no_ca_cert_required: 2/2] applet: remove the ca cert nag dialog.
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/thaller/758076_ui_no_ca_cert_required: 2/2] applet: remove the ca cert nag dialog.
- Date: Fri, 16 Aug 2013 09:26:00 +0000 (UTC)
commit 731bd90a3edfeb6c8faddcaf436a02dc2b3a0488
Author: Thomas Haller <thaller redhat com>
Date: Fri Aug 16 11:20:11 2013 +0200
applet: remove the ca cert nag dialog.
The previous commit introduced a new flag "No CA certificate required".
This change of the UI replaces the warning dialog (nag_dialog).
Remove all parts of the nag dialog from the code and translation files.
Signed-off-by: Thomas Haller <thaller redhat com>
org.gnome.nm-applet.gschema.xml.in | 12 --
po/POTFILES.in | 1 -
po/af.po | 12 --
po/an.po | 12 --
po/ar.po | 12 --
po/as.po | 12 --
po/ast.po | 12 --
po/be.po | 12 --
po/bg.po | 12 --
po/ca.po | 12 --
po/ca valencia po | 12 --
po/crh.po | 4 -
po/cs.po | 4 -
po/da.po | 4 -
po/de.po | 4 -
po/el.po | 4 -
po/en_GB.po | 12 --
po/eo.po | 12 --
po/es.po | 4 -
po/eu.po | 4 -
po/fa.po | 12 --
po/fi.po | 12 --
po/fr.po | 12 --
po/gl.po | 4 -
po/gu.po | 12 --
po/he.po | 4 -
po/hi.po | 12 --
po/hu.po | 4 -
po/id.po | 4 -
po/it.po | 4 -
po/ja.po | 12 --
po/kk.po | 4 -
po/km.po | 12 --
po/ko.po | 12 --
po/ku.po | 12 --
po/lt.po | 4 -
po/lv.po | 4 -
po/mk.po | 13 --
po/ml.po | 4 -
po/mr.po | 12 --
po/ms.po | 12 --
po/nb.po | 4 -
po/nl.po | 12 --
po/nn.po | 12 --
po/or.po | 12 --
po/pa.po | 12 --
po/pl.po | 4 -
po/pt.po | 12 --
po/pt_BR.po | 4 -
po/ro.po | 12 --
po/ru.po | 4 -
po/sk.po | 4 -
po/sl.po | 4 -
po/sr.po | 12 --
po/sr latin po | 12 --
po/sv.po | 12 --
po/ta.po | 12 --
po/te.po | 12 --
po/tg.po | 4 -
po/th.po | 12 --
po/tr.po | 12 --
po/ug.po | 12 --
po/uk.po | 12 --
po/vi.po | 12 --
po/zh_CN.po | 12 --
po/zh_HK.po | 4 -
po/zh_TW.po | 4 -
src/applet-device-wifi.c | 84 -----------
src/connection-editor/ce-page.c | 8 -
src/connection-editor/ce-page.h | 4 -
src/connection-editor/nm-connection-editor.c | 33 -----
src/connection-editor/nm-connection-editor.h | 1 -
src/connection-editor/page-8021x-security.c | 9 --
src/connection-editor/page-wifi-security.c | 15 --
src/libnm-gtk/nm-wifi-dialog.c | 56 --------
src/libnm-gtk/nm-wifi-dialog.h | 6 -
src/libnm-gtk/nm-wireless-dialog.c | 17 ---
src/libnm-gtk/nm-wireless-dialog.h | 9 --
src/wireless-security/Makefile.am | 1 -
src/wireless-security/eap-method-peap.c | 2 -
src/wireless-security/eap-method-tls.c | 2 -
src/wireless-security/eap-method-ttls.c | 2 -
src/wireless-security/eap-method.c | 196 --------------------------
src/wireless-security/eap-method.h | 10 --
src/wireless-security/nag-user-dialog.ui | 137 ------------------
src/wireless-security/wireless-security.c | 30 ----
src/wireless-security/wireless-security.h | 6 -
src/wireless-security/ws-dynamic-wep.c | 7 -
src/wireless-security/ws-wpa-eap.c | 7 -
89 files changed, 0 insertions(+), 1236 deletions(-)
---
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
index bf3b9f4..406fc01 100644
--- a/org.gnome.nm-applet.gschema.xml.in
+++ b/org.gnome.nm-applet.gschema.xml.in
@@ -37,16 +37,4 @@
<_description>Set to FALSE to disable displaying the applet in the notification area.</_description>
</key>
</schema>
- <schema id="org.gnome.nm-applet.eap">
- <key name="ignore-ca-cert" type="b">
- <default>false</default>
- <_summary>Ignore CA certificate</_summary>
- <_description>Set this to true to disable warnings about CA certificates in EAP
authentication.</_description>
- </key>
- <key name="ignore-phase2-ca-cert" type="b">
- <default>false</default>
- <_summary>Ignore CA certificate</_summary>
- <_description>Set this to true to disable warnings about CA certificates in phase 2 of EAP
authentication.</_description>
- </key>
- </schema>
</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index daef9f3..a7c1ce6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -90,7 +90,6 @@ src/wireless-security/eap-method-tls.c
[type: gettext/glade]src/wireless-security/eap-method-tls.ui
src/wireless-security/eap-method-ttls.c
[type: gettext/glade]src/wireless-security/eap-method-ttls.ui
-[type: gettext/glade]src/wireless-security/nag-user-dialog.ui
src/wireless-security/wireless-security.c
[type: gettext/glade]src/wireless-security/ws-dynamic-wep.ui
[type: gettext/glade]src/wireless-security/ws-leap.ui
diff --git a/po/af.po b/po/af.po
index 0d83ff9..c2c5403 100644
--- a/po/af.po
+++ b/po/af.po
@@ -2601,18 +2601,6 @@ msgstr ""
msgid "_User certificate:"
msgstr ""
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr ""
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Nee"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Ja"
-
#: ../src/wireless-security/wireless-security.c:380
msgid "TLS"
msgstr "TLS"
diff --git a/po/an.po b/po/an.po
index 31e5543..71581b8 100644
--- a/po/an.po
+++ b/po/an.po
@@ -2926,18 +2926,6 @@ msgstr "Clau pri_vada:"
msgid "_Private key password:"
msgstr "Clau de pase de clau _privada:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "No a_visarme de nuevo"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "No"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Si"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/ar.po b/po/ar.po
index f93efe9..ccd2e9c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2672,18 +2672,6 @@ msgstr "كل_مة سر المفتاح السري:"
msgid "_User certificate:"
msgstr "شهادة المست_خدم:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "لا _تنبهني ثانيةً"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "لا"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "نعم"
-
#: ../src/wireless-security/wireless-security.c:384
msgid "TLS"
msgstr "TLS"
diff --git a/po/as.po b/po/as.po
index f66364d..c1831b8 100644
--- a/po/as.po
+++ b/po/as.po
@@ -2939,18 +2939,6 @@ msgstr "ব্যক্তিগত কি' (_k):"
msgid "_Private key password:"
msgstr "ব্যক্তিগত কি' পাছৱাৰ্ড (_P):"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "মোক আকৌ সতৰ্ক নকৰিব (_w)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "নহয়"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "হয়"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/ast.po b/po/ast.po
index a901f34..b5db8ba 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2662,18 +2662,6 @@ msgstr "Contraseña de clave pri_vada:"
msgid "_User certificate:"
msgstr "Certificáu del _usuariu:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Nun m'avisar otra vuelta"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Non"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Sí"
-
#: ../src/wireless-security/wireless-security.c:384
msgid "TLS"
msgstr "TLS"
diff --git a/po/be.po b/po/be.po
index 9636404..30154e9 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3211,18 +3211,6 @@ msgstr "Прыватны _ключ:"
msgid "_Private key password:"
msgstr "_Пароль прыватнага ключа:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "_Больш не папярэджваць мяне"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Не"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Так"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/bg.po b/po/bg.po
index c6d532e..cf45e8f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3190,18 +3190,6 @@ msgstr "Частен _ключ:"
msgid "_Private key password:"
msgstr "Парола за _частен ключ:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "_Без повече предупреждения за това"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Не"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Да"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/ca.po b/po/ca.po
index 898a92d..5e9ee8f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3237,18 +3237,6 @@ msgstr "Clau _privada:"
msgid "_Private key password:"
msgstr "Contrasenya de la clau _privada:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "No em tornis a _avisar"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "No"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Sí"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/ca valencia po b/po/ca valencia po
index 7693ccb..0970fc9 100644
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@ -2868,18 +2868,6 @@ msgstr "Clau _privada:"
msgid "_Private key password:"
msgstr "Contrasenya de la clau _privada:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "No em tornes a _avisar"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "No"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Sí"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/crh.po b/po/crh.po
index df110c6..afc48f9 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -3260,10 +3260,6 @@ msgstr "Hususiy _anahtar:"
msgid "_Private key password:"
msgstr "_Hususiy anahtar sır-sözü:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Meni artıq _tenbihleme"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/cs.po b/po/cs.po
index 8dafdb2..408841d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3261,10 +3261,6 @@ msgstr "Soukromý _klíč:"
msgid "_Private key password:"
msgstr "_Heslo soukromého klíče:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Příště mne ne_varovat"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/da.po b/po/da.po
index a0e68da..fc30d4a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3241,10 +3241,6 @@ msgstr "Privat nøg_le:"
msgid "_Private key password:"
msgstr "Adgangskode til _privat nøgle:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Advar mi_g ikke igen"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/de.po b/po/de.po
index 96748d0..51196c5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3405,10 +3405,6 @@ msgstr "Geheimer _Schlüssel:"
msgid "_Private key password:"
msgstr "_Passwort des geheimen Schlüssels:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Diese _Warnung nicht mehr anzeigen"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/el.po b/po/el.po
index c9bd05f..c90beb7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3234,10 +3234,6 @@ msgstr "Ιδιωτικό κ_λειδί:"
msgid "_Private key password:"
msgstr "Συνθηματικό _ιδιωτικού κλειδιού:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Να _μη γίνει προειδοποίηση ξανά"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/en_GB.po b/po/en_GB.po
index 8a49f4e..4aecf21 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3202,18 +3202,6 @@ msgstr "Private _key:"
msgid "_Private key password:"
msgstr "_Private key password:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Don't _warn me again"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "No"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Yes"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/eo.po b/po/eo.po
index ebb3545..403b510 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2620,18 +2620,6 @@ msgstr "Privata ŝ_losilo:"
msgid "_Private key password:"
msgstr "_Pasvorto por privata ŝlosilo:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Ne _averti min denove"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Ne"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Jes"
-
#: ../src/wireless-security/wireless-security.c:385
msgid "TLS"
msgstr "TLS"
diff --git a/po/es.po b/po/es.po
index 96eb58b..05bb5eb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3359,10 +3359,6 @@ msgstr "Clave pri_vada:"
msgid "_Private key password:"
msgstr "Contraseña de clave _privada:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "No a_visarme de nuevo"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/eu.po b/po/eu.po
index 51611f4..1e05ccf 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3235,10 +3235,6 @@ msgstr "_Gako pribatua:"
msgid "_Private key password:"
msgstr "_Gako pribatuaren pasahitza:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "_Ez abisatu berriro"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/fa.po b/po/fa.po
index a6746ff..d60f945 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -2846,18 +2846,6 @@ msgstr "کلید خصوصی"
msgid "_Private key password:"
msgstr "گذرواژه کلید _خصوصی:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "دیگر به من ا_خطار نده"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "خیر"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "بلی"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/fi.po b/po/fi.po
index e748817..239e01e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3334,18 +3334,6 @@ msgstr "Y_ksityinen avain:"
msgid "_Private key password:"
msgstr "_Yksityisen avaimen salasana:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "_Älä varoita uudelleen"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Ei"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Kyllä"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/fr.po b/po/fr.po
index 8487080..b67b364 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1327,10 +1327,6 @@ msgstr "_Mot de passe :"
#: ../src/connection-editor/ce-page-ethernet.ui.h:1
#: ../src/connection-editor/ce-page-infiniband.ui.h:1
#: ../src/connection-editor/ce-page-vlan.ui.h:1
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Oui"
-
#: ../src/connection-editor/ce-page-ethernet.ui.h:2
#: ../src/connection-editor/ce-page-infiniband.ui.h:2
#: ../src/connection-editor/ce-page-vlan.ui.h:2
@@ -1340,10 +1336,6 @@ msgstr "Seulement à l'activation"
#: ../src/connection-editor/ce-page-ethernet.ui.h:3
#: ../src/connection-editor/ce-page-infiniband.ui.h:3
#: ../src/connection-editor/ce-page-vlan.ui.h:3
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Non"
-
#: ../src/connection-editor/ce-page-ethernet.ui.h:4
#: ../src/connection-editor/ce-page-ip4.ui.h:1
#: ../src/connection-editor/ce-page-ip6.ui.h:1
@@ -3252,10 +3244,6 @@ msgstr "_Clé privée :"
msgid "_Private key password:"
msgstr "_Mot de passe de la clé privée :"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Ne plus m'a_vertir"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/gl.po b/po/gl.po
index a2a50df..446db0f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3366,10 +3366,6 @@ msgstr "_Chave privada:"
msgid "_Private key password:"
msgstr "Contrasinal de chave _privada:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Non a_visar de novo"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/gu.po b/po/gu.po
index f38ddbc..d7aad65 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -2758,18 +2758,6 @@ msgstr "ખાનગી કી (_k):"
msgid "_Private key password:"
msgstr "ખાનગી કી પાસવર્ડ (_P):"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "ફરીથી મને ચેતવો નહિં (_w)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "ના"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "હા"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/he.po b/po/he.po
index e92eeb6..2f52389 100644
--- a/po/he.po
+++ b/po/he.po
@@ -3313,10 +3313,6 @@ msgstr "_מפתח פרטי:"
msgid "_Private key password:"
msgstr "ססמת מפתח _פרטי:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "לא לה_זהיר אותי שוב"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/hi.po b/po/hi.po
index 295b32f..ec49d96 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3338,18 +3338,6 @@ msgstr "निजी कुंजी (_k):"
msgid "_Private key password:"
msgstr "निजी कुंजी कूटशब्द (_P):"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "मुझे फिर मत चेताएँ (_w)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "नहीं"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "हाँ"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "टीएलएस"
diff --git a/po/hu.po b/po/hu.po
index ffaefaa..44f7e2b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3352,10 +3352,6 @@ msgstr "Személyes k_ulcs:"
msgid "_Private key password:"
msgstr "S_zemélyes kulcs jelszava:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "_Ne figyelmeztessen újra"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/id.po b/po/id.po
index 3b798db..1a86dea 100644
--- a/po/id.po
+++ b/po/id.po
@@ -3338,10 +3338,6 @@ msgstr "_Kunci privat:"
msgid "_Private key password:"
msgstr "Sandi kunci _pribadi:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Jangan peringatkan saya lagi"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/it.po b/po/it.po
index b150cf4..fc597aa 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3409,10 +3409,6 @@ msgstr "_Chiave privata:"
msgid "_Private key password:"
msgstr "Password della chiave _privata:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Non a_vvisare più"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/ja.po b/po/ja.po
index b8faa9e..1b57dbd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3088,18 +3088,6 @@ msgstr "プライベートキー(_K):"
msgid "_Private key password:"
msgstr "プライベートキーパスワード(_P):"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "二度と警告しない(_W)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "いいえ"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "はい"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/kk.po b/po/kk.po
index 38f72a6..ece1b52 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -3291,10 +3291,6 @@ msgstr "Жеке _кілт:"
msgid "_Private key password:"
msgstr "Ж_еке кілт паролі:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Мені келесіде е_скертпеу"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/km.po b/po/km.po
index 05cf22b..e0d2abd 100644
--- a/po/km.po
+++ b/po/km.po
@@ -2941,18 +2941,6 @@ msgstr "សោឯកជន ៖"
msgid "_Private key password:"
msgstr "ពាក្យសម្ងាត់សោឯកជន ៖"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "កុំព្រមានខ្ញុំម្ដងទៀត"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "ទេ"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "បាទ/ចាស"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/ko.po b/po/ko.po
index be51c08..3cdbb3f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3118,18 +3118,6 @@ msgstr "비밀키(_K):"
msgid "_Private key password:"
msgstr "비밀키 암호(_P):"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "다시 보지 않기(_W)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "아니요"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "예"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/ku.po b/po/ku.po
index 4d502c9..73fde06 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -2600,18 +2600,6 @@ msgstr "Şî_freya mifteya taybet:"
msgid "_User certificate:"
msgstr "Sertîfikaya _bikarhêner:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Careke din _hişyar neke"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Na"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Erê"
-
#: ../src/wireless-security/wireless-security.c:384
msgid "TLS"
msgstr "TLS"
diff --git a/po/lt.po b/po/lt.po
index 8bf091c..a85c914 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3377,10 +3377,6 @@ msgstr "Asmeninis _raktas:"
msgid "_Private key password:"
msgstr "_Asmeninio rakto slaptažodis:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Daugiau _neperspėti"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/lv.po b/po/lv.po
index 5319d6c..13fc492 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -3234,10 +3234,6 @@ msgstr "Privātā _atslēga:"
msgid "_Private key password:"
msgstr "_Privātās atslēgas parole:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "_Vairs nebrīdināt"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/mk.po b/po/mk.po
index c112181..a9a9191 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -2763,19 +2763,6 @@ msgstr "Лозинка на _приватниот клуч:"
msgid "_User certificate:"
msgstr "_Кориснички сертификат:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-#| msgid "Don't warn me again"
-msgid "Don't _warn me again"
-msgstr "Не ме _предупредувај пак"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Не"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Да"
-
#: ../src/wireless-security/wireless-security.c:384
msgid "TLS"
msgstr "TLS"
diff --git a/po/ml.po b/po/ml.po
index c96e6b4..fd69231 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -3194,10 +3194,6 @@ msgstr "സ്വകാര്യ _കീ:"
msgid "_Private key password:"
msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "ഇനി _മുന്നറിയിപ്പ് നല്കേണ്ടതില്ല"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/mr.po b/po/mr.po
index b3857ff..a88039e 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -2690,18 +2690,6 @@ msgstr "प्राइव्हेट कि पासवर्ड (_P):"
msgid "_User certificate:"
msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "मला पुन्हा सावध करू नका (_w)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "नाही"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "होय"
-
#: ../src/wireless-security/wireless-security.c:380
msgid "TLS"
msgstr "TLS"
diff --git a/po/ms.po b/po/ms.po
index c942890..1884ce9 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -2699,18 +2699,6 @@ msgstr "_Katalaluan Kunci Persendirian:"
msgid "_User certificate:"
msgstr "_Sijil pengesahan pengguna:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Jangan beri _amaran kepada saya lagi"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Tidak"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Ya"
-
#: ../src/wireless-security/wireless-security.c:384
msgid "TLS"
msgstr "TLS"
diff --git a/po/nb.po b/po/nb.po
index be033bc..1bb7a58 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3336,10 +3336,6 @@ msgstr "Privat nø_kkel:"
msgid "_Private key password:"
msgstr "Passord for _privat nøkkel:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Ikke ad_var meg igjen"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/nl.po b/po/nl.po
index 6999e0f..b2a5b5b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3300,18 +3300,6 @@ msgstr "_Privésleutel:"
msgid "_Private key password:"
msgstr "Privésleutel _wachtwoord:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Geen _waarschuwing meer geven"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Nee"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Ja"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/nn.po b/po/nn.po
index 0c33e7b..e625b60 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2804,18 +2804,6 @@ msgstr "Privat nø_kkel:"
msgid "_Private key password:"
msgstr "_Passord for privat nøkkel:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Ikkje _åtvar meg igjen"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Nei"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Ja"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/or.po b/po/or.po
index 9bc9fa1..615d3eb 100644
--- a/po/or.po
+++ b/po/or.po
@@ -2677,18 +2677,6 @@ msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_
msgid "_User certificate:"
msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "ମୋତେ ପୁଣିଥରେ ଚେତାବନୀ ଦିଅନ୍ତୁ ନାହିଁ (_w)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "ନାଁ"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "ହଁ"
-
#: ../src/wireless-security/wireless-security.c:378
msgid "TLS"
msgstr "TLS"
diff --git a/po/pa.po b/po/pa.po
index fbdad39..802a09b 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -3193,18 +3193,6 @@ msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ(_k):"
msgid "_Private key password:"
msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਪਾਸਵਰਡ(_P):"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "ਮੈਨੂੰ ਚੇਤਾਵਨੀ ਫੇਰ ਨਾ ਦਿਓ(_w)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "ਨਹੀਂ"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "ਹਾਂ"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/pl.po b/po/pl.po
index 7828348..01cdc5c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3362,10 +3362,6 @@ msgstr "_Klucz prywatny:"
msgid "_Private key password:"
msgstr "_Hasło klucza prywatnego:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Nie ostrzegaj pono_wnie"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/pt.po b/po/pt.po
index 457fe26..4cd0389 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1324,10 +1324,6 @@ msgstr "_Senha:"
#: ../src/connection-editor/ce-page-ethernet.ui.h:1
#: ../src/connection-editor/ce-page-infiniband.ui.h:1
#: ../src/connection-editor/ce-page-vlan.ui.h:1
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Sim"
-
#: ../src/connection-editor/ce-page-ethernet.ui.h:2
#: ../src/connection-editor/ce-page-infiniband.ui.h:2
#: ../src/connection-editor/ce-page-vlan.ui.h:2
@@ -1337,10 +1333,6 @@ msgstr "Apenas ao ativar"
#: ../src/connection-editor/ce-page-ethernet.ui.h:3
#: ../src/connection-editor/ce-page-infiniband.ui.h:3
#: ../src/connection-editor/ce-page-vlan.ui.h:3
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Não"
-
#: ../src/connection-editor/ce-page-ethernet.ui.h:4
#: ../src/connection-editor/ce-page-ip4.ui.h:1
#: ../src/connection-editor/ce-page-ip6.ui.h:1
@@ -3240,10 +3232,6 @@ msgstr "Chave _Privada:"
msgid "_Private key password:"
msgstr "Senha da chave _privada:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Não me a_visar novamente"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9d1fa3e..8017b15 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3367,10 +3367,6 @@ msgstr "Chave _privada:"
msgid "_Private key password:"
msgstr "_Senha da chave privada:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Nã_o me avise novamente"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/ro.po b/po/ro.po
index 55ff993..7fe6bdf 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2696,18 +2696,6 @@ msgstr "Parola pentru cheia _privată:"
msgid "_User certificate:"
msgstr "Certificat _utilizator:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Nu mai afișa acest a_vertisment"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Nu"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Da"
-
#: ../src/wireless-security/wireless-security.c:380
msgid "TLS"
msgstr "TLS"
diff --git a/po/ru.po b/po/ru.po
index bd00eda..35e253e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3479,10 +3479,6 @@ msgstr "Секретный _ключ:"
msgid "_Private key password:"
msgstr "_Пароль к секретному ключу:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "_Больше не предупреждать"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/sk.po b/po/sk.po
index 01482db..ceabfbe 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3438,10 +3438,6 @@ msgstr "Súkromný _kľúč:"
msgid "_Private key password:"
msgstr "Heslo _súkromného kľúča:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Viac _ma neupozorňovať"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/sl.po b/po/sl.po
index 4c538f8..87d92df 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3228,10 +3228,6 @@ msgstr "Osebni _ključ:"
msgid "_Private key password:"
msgstr "_Geslo osebnega ključa:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "_Ne opozori me več"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/sr.po b/po/sr.po
index a78975f..bcd59bd 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3224,18 +3224,6 @@ msgstr "Приватни _кључ:"
msgid "_Private key password:"
msgstr "Л_озинка приватног кључа:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Не _упозоравај ме више"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Не"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Да"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "ТЛС"
diff --git a/po/sr latin po b/po/sr latin po
index d2ebe8c..a5a238f 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -3224,18 +3224,6 @@ msgstr "Privatni _ključ:"
msgid "_Private key password:"
msgstr "L_ozinka privatnog ključa:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Ne _upozoravaj me više"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Ne"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Da"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/sv.po b/po/sv.po
index dfe2641..b1f7cb4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2795,18 +2795,6 @@ msgstr "Privat _nyckel:"
msgid "_Private key password:"
msgstr "Lösenord för _privat nyckel:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Varna mig _inte igen"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Nej"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Ja"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/ta.po b/po/ta.po
index dcd7492..5d4c88a 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -2711,18 +2711,6 @@ msgstr "தனிப்பட்ட விசை கடவுச்சொல்
msgid "_User certificate:"
msgstr "பயனர் சான்றிதழ் (_U):"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "மீண்டும் என்னை எச்சரிக்காதே (_w)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "இல்லை"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "ஆம்"
-
#: ../src/wireless-security/wireless-security.c:385
msgid "TLS"
msgstr "TLS"
diff --git a/po/te.po b/po/te.po
index 451138b..e3a2ddc 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2806,18 +2806,6 @@ msgstr "వ్యక్తిగత కీ (_k):"
msgid "_Private key password:"
msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "నన్ను మరలా వారించవద్దు (_w)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "కాదు"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "అవును"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/tg.po b/po/tg.po
index 35693e8..f7a57e9 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -3189,10 +3189,6 @@ msgstr ""
msgid "_Private key password:"
msgstr ""
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr ""
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr ""
diff --git a/po/th.po b/po/th.po
index 981fad2..89729e8 100644
--- a/po/th.po
+++ b/po/th.po
@@ -2765,18 +2765,6 @@ msgstr "กุญแจ_ส่วนตัว:"
msgid "_Private key password:"
msgstr "_รหัสผ่านกุญแจส่วนตัว:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "ไ_ม่ต้องเตือนฉันอีก"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "ไม่"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "ใช่"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/tr.po b/po/tr.po
index 7e290bc..05795ff 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2683,18 +2683,6 @@ msgstr "Ö_zel anahtar parolası:"
msgid "_User certificate:"
msgstr "_Kullanıcı sertifikası:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Beni tekrar _uyarma"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Hayır"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Evet"
-
#: ../src/wireless-security/wireless-security.c:384
msgid "TLS"
msgstr "TLS"
diff --git a/po/ug.po b/po/ug.po
index 6e1b9e8..ac478d0 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -3066,18 +3066,6 @@ msgstr "شەخسىي ئاچقۇچ(_K)"
msgid "_Private key password:"
msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "مېنى يەنە ئاگاھلاندۇرما(_W)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "ياق"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "ھەئە"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/uk.po b/po/uk.po
index d2f678b..897d542 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2766,18 +2766,6 @@ msgstr "Приватний кл_юч:"
msgid "_Private key password:"
msgstr "Па_роль до мережного ключа:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "_Не попереджувати надалі"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Ні"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Так"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/vi.po b/po/vi.po
index cc231f1..ab7350d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -3111,18 +3111,6 @@ msgstr "_Khoá riêng:"
msgid "_Private key password:"
msgstr "_Mật khẩu khoá riêng:"
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Đừ_ng cảnh báo nữa"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Không"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Có"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6257fb8..0f83eeb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3134,18 +3134,6 @@ msgstr "私钥(_K)："
msgid "_Private key password:"
msgstr "私钥密码(_P)："
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "以后不再警告(_W)"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "否"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "是"
-
#: ../src/wireless-security/wireless-security.c:394
msgid "TLS"
msgstr "TLS"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 638bfe3..664bb3d 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -3274,10 +3274,6 @@ msgstr "私密密碼匙(_K)："
msgid "_Private key password:"
msgstr "私密密碼匙密碼(_P)："
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "不要再警告我(_W)"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a5babc7..6eb8648 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3271,10 +3271,6 @@ msgstr "私密金鑰(_K)："
msgid "_Private key password:"
msgstr "私密金鑰密碼(_P)："
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "不要再警告我(_W)"
-
#: ../src/wireless-security/wireless-security.c:421
msgid "TLS"
msgstr "TLS"
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 68af55b..a54585e 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -52,8 +52,6 @@
static void wifi_dialog_response_cb (GtkDialog *dialog, gint response, gpointer user_data);
-static void nag_dialog_response_cb (GtkDialog *nag_dialog, gint response, gpointer user_data);
-
static NMAccessPoint *update_active_ap (NMDevice *device, NMDeviceState state, NMApplet *applet);
static void _do_new_auto_connection (NMApplet *applet,
@@ -357,22 +355,6 @@ more_info_wifi_dialog_response_cb (GtkDialog *foo,
goto done;
}
- if (!nma_wifi_dialog_get_nag_ignored (dialog)) {
- GtkWidget *nag_dialog;
-
- /* Nag the user about certificates or whatever. Only destroy the dialog
- * if no nagging was done.
- */
- nag_dialog = nma_wifi_dialog_nag_user (dialog);
- if (nag_dialog) {
- gtk_window_set_transient_for (GTK_WINDOW (nag_dialog), GTK_WINDOW (dialog));
- g_signal_connect (nag_dialog, "response",
- G_CALLBACK (nag_dialog_response_cb),
- dialog);
- return;
- }
- }
-
/* nma_wifi_dialog_get_connection() returns a connection with the
* refcount incremented, so the caller must remember to unref it.
*/
@@ -1334,36 +1316,6 @@ wifi_get_icon (NMDevice *device,
return pixbuf ? g_object_ref (pixbuf) : NULL;
}
-static gboolean
-wifi_dialog_close (gpointer user_data)
-{
- GtkWidget *dialog = GTK_WIDGET (user_data);
-
- gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
- return FALSE;
-}
-
-static void
-wifi_dialog_destroyed (gpointer data, GObject *dialog_ptr)
-{
- /* remove the idle function; for not to call wifi_dialog_close() on invalid pointer */
- g_idle_remove_by_data (dialog_ptr);
-}
-
-static void
-nag_dialog_response_cb (GtkDialog *nag_dialog,
- gint response,
- gpointer user_data)
-{
- NMAWifiDialog *wifi_dialog = NMA_WIFI_DIALOG (user_data);
-
- if (response == GTK_RESPONSE_NO) { /* user opted not to correct the warning */
- nma_wifi_dialog_set_nag_ignored (wifi_dialog, TRUE);
- g_idle_add (wifi_dialog_close, wifi_dialog);
- g_object_weak_ref (G_OBJECT (wifi_dialog), wifi_dialog_destroyed, NULL);
- }
-}
-
static void
activate_existing_cb (NMClient *client,
@@ -1417,22 +1369,6 @@ wifi_dialog_response_cb (GtkDialog *foo,
if (response != GTK_RESPONSE_OK)
goto done;
- if (!nma_wifi_dialog_get_nag_ignored (dialog)) {
- GtkWidget *nag_dialog;
-
- /* Nag the user about certificates or whatever. Only destroy the dialog
- * if no nagging was done.
- */
- nag_dialog = nma_wifi_dialog_nag_user (dialog);
- if (nag_dialog) {
- gtk_window_set_transient_for (GTK_WINDOW (nag_dialog), GTK_WINDOW (dialog));
- g_signal_connect (nag_dialog, "response",
- G_CALLBACK (nag_dialog_response_cb),
- dialog);
- return;
- }
- }
-
/* nma_wifi_dialog_get_connection() returns a connection with the
* refcount incremented, so the caller must remember to unref it.
*/
@@ -1527,7 +1463,6 @@ typedef struct {
SecretsRequest req;
GtkWidget *dialog;
- GtkWidget *nag_dialog;
} NMWifiInfo;
static void
@@ -1555,25 +1490,6 @@ get_secrets_dialog_response_cb (GtkDialog *foo,
const char *key_mgmt, *auth_alg;
GError *error = NULL;
- /* Handle the nag dialog specially; don't want to clear the NMActiveConnection
- * destroy handler yet if the main dialog isn't going away.
- */
- if ((response == GTK_RESPONSE_OK) && !nma_wifi_dialog_get_nag_ignored (dialog)) {
- GtkWidget *widget;
-
- /* Nag the user about certificates or whatever. Only destroy the dialog
- * if no nagging was done.
- */
- widget = nma_wifi_dialog_nag_user (dialog);
- if (widget) {
- gtk_window_set_transient_for (GTK_WINDOW (widget), GTK_WINDOW (dialog));
- g_signal_connect (widget, "response",
- G_CALLBACK (nag_dialog_response_cb),
- dialog);
- return;
- }
- }
-
if (response != GTK_RESPONSE_OK) {
g_set_error (&error,
NM_SECRET_AGENT_ERROR,
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index 4846bf3..da5a429 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -284,14 +284,6 @@ ce_page_get_next_available_name (GSList *connections, const char *format)
return cname;
}
-GtkWidget *
-ce_page_nag_user (CEPage *self)
-{
- if (CE_PAGE_GET_CLASS (self)->nag_user)
- return CE_PAGE_GET_CLASS (self)->nag_user (self);
- return NULL;
-}
-
static void
emit_initialized (CEPage *self, GError *error)
{
diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h
index 578f62e..f5e96d6 100644
--- a/src/connection-editor/ce-page.h
+++ b/src/connection-editor/ce-page.h
@@ -85,8 +85,6 @@ typedef struct {
/* Virtual functions */
gboolean (*validate) (CEPage *self, NMConnection *connection, GError **error);
- /* Let the page warn the user if some property needs review */
- GtkWidget * (*nag_user) (CEPage *self);
/* Signals */
void (*changed) (CEPage *self);
@@ -133,8 +131,6 @@ gboolean ce_page_get_initialized (CEPage *self);
char *ce_page_get_next_available_name (GSList *connections, const char *format);
-GtkWidget *ce_page_nag_user (CEPage *self);
-
/* Only for subclasses */
NMConnection *ce_page_new_connection (const char *format,
const char *ctype,
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index acb4e55..377b376 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -992,26 +992,9 @@ ok_button_clicked_save_connection (NMConnectionEditor *self)
}
static void
-nag_dialog_response_cb (GtkDialog *dialog,
- gint response,
- gpointer user_data)
-{
- NMConnectionEditor *self = NM_CONNECTION_EDITOR (user_data);
-
- gtk_widget_hide (GTK_WIDGET (dialog));
- if (response == GTK_RESPONSE_NO) {
- /* user opted not to correct the warning */
- ok_button_clicked_save_connection (self);
- }
- g_signal_handler_disconnect (dialog, self->nag_id);
- self->nag_id = 0;
-}
-
-static void
ok_button_clicked_cb (GtkWidget *widget, gpointer user_data)
{
NMConnectionEditor *self = NM_CONNECTION_EDITOR (user_data);
- GSList *iter;
/* If the dialog is busy waiting for authorization or something,
* don't destroy it until authorization returns.
@@ -1019,22 +1002,6 @@ ok_button_clicked_cb (GtkWidget *widget, gpointer user_data)
if (self->busy)
return;
- /* Make sure the user is warned about insecure security options like no
- * CA certificate.
- */
- g_warn_if_fail (self->nag_id == 0);
- for (iter = self->pages; iter; iter = g_slist_next (iter)) {
- CEPage *page = iter->data;
- GtkWidget *nag_dialog;
-
- nag_dialog = ce_page_nag_user (page);
- if (nag_dialog) {
- gtk_window_set_transient_for (GTK_WINDOW (nag_dialog), GTK_WINDOW (self->window));
- self->nag_id = g_signal_connect (nag_dialog, "response", G_CALLBACK
(nag_dialog_response_cb), self);
- return;
- }
- }
-
ok_button_clicked_save_connection (self);
}
diff --git a/src/connection-editor/nm-connection-editor.h b/src/connection-editor/nm-connection-editor.h
index 8bf2ee8..4798b0f 100644
--- a/src/connection-editor/nm-connection-editor.h
+++ b/src/connection-editor/nm-connection-editor.h
@@ -61,7 +61,6 @@ typedef struct {
GtkWidget *ok_button;
GtkWidget *cancel_button;
GtkWidget *export_button;
- guint nag_id;
gboolean busy;
gboolean init_run;
diff --git a/src/connection-editor/page-8021x-security.c b/src/connection-editor/page-8021x-security.c
index 547709f..62a8e84 100644
--- a/src/connection-editor/page-8021x-security.c
+++ b/src/connection-editor/page-8021x-security.c
@@ -185,14 +185,6 @@ validate (CEPage *page, NMConnection *connection, GError **error)
return valid;
}
-static GtkWidget *
-nag_user (CEPage *page)
-{
- CEPage8021xSecurityPrivate *priv = CE_PAGE_8021X_SECURITY_GET_PRIVATE (page);
-
- return priv->security ? wireless_security_nag_user (priv->security) : NULL;
-}
-
static void
ce_page_8021x_security_init (CEPage8021xSecurity *self)
{
@@ -226,5 +218,4 @@ ce_page_8021x_security_class_init (CEPage8021xSecurityClass *security_class)
object_class->dispose = dispose;
parent_class->validate = validate;
- parent_class->nag_user = nag_user;
}
diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c
index d9d771f..7f9e2cd 100644
--- a/src/connection-editor/page-wifi-security.c
+++ b/src/connection-editor/page-wifi-security.c
@@ -519,20 +519,6 @@ validate (CEPage *page, NMConnection *connection, GError **error)
return valid;
}
-static GtkWidget *
-nag_user (CEPage *page)
-{
- WirelessSecurity *sec;
- GtkWidget *nag = NULL;
-
- sec = wireless_security_combo_get_active (CE_PAGE_WIFI_SECURITY (page));
- if (sec) {
- nag = wireless_security_nag_user (sec);
- wireless_security_unref (sec);
- }
- return nag;
-}
-
static void
ce_page_wifi_security_class_init (CEPageWifiSecurityClass *wireless_security_class)
{
@@ -543,5 +529,4 @@ ce_page_wifi_security_class_init (CEPageWifiSecurityClass *wireless_security_cla
object_class->dispose = dispose;
parent_class->validate = validate;
- parent_class->nag_user = nag_user;
}
diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
index 8a98957..2a53ac0 100644
--- a/src/libnm-gtk/nm-wifi-dialog.c
+++ b/src/libnm-gtk/nm-wifi-dialog.c
@@ -67,7 +67,6 @@ typedef struct {
GtkSizeGroup *group;
GtkWidget *sec_combo;
- gboolean nag_ignored;
gboolean network_name_focus;
gboolean secrets_only;
@@ -93,22 +92,6 @@ typedef struct {
static gboolean security_combo_init (NMAWifiDialog *self, gboolean secrets_only);
static void ssid_entry_changed (GtkWidget *entry, gpointer user_data);
-void
-nma_wifi_dialog_set_nag_ignored (NMAWifiDialog *self, gboolean ignored)
-{
- g_return_if_fail (self != NULL);
-
- NMA_WIFI_DIALOG_GET_PRIVATE (self)->nag_ignored = ignored;
-}
-
-gboolean
-nma_wifi_dialog_get_nag_ignored (NMAWifiDialog *self)
-{
- g_return_val_if_fail (self != NULL, FALSE);
-
- return NMA_WIFI_DIALOG_GET_PRIVATE (self)->nag_ignored;
-}
-
static void
size_group_clear (GtkSizeGroup *group)
{
@@ -1338,45 +1321,6 @@ nma_wifi_dialog_new_for_create (NMClient *client, NMRemoteSettings *settings)
return internal_new_other (client, settings, TRUE);
}
-/**
- * nma_wifi_dialog_nag_user:
- * @self:
- *
- * Returns: (transfer full):
- */
-GtkWidget *
-nma_wifi_dialog_nag_user (NMAWifiDialog *self)
-{
- NMAWifiDialogPrivate *priv;
- GtkWidget *combo, *nag;
- GtkTreeModel *model;
- GtkTreeIter iter;
- WirelessSecurity *sec = NULL;
-
- g_return_val_if_fail (self != NULL, NULL);
-
- priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
-
- combo = GTK_WIDGET (gtk_builder_get_object (priv->builder, "security_combo"));
- g_return_val_if_fail (combo != NULL, NULL);
-
- /* Ask the security method if it wants to nag the user. */
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
- if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) {
- g_warning ("%s: no active security combo box item.", __func__);
- return NULL;
- }
-
- gtk_tree_model_get (model, &iter, S_SEC_COLUMN, &sec, -1);
- if (sec) {
- nag = wireless_security_nag_user (sec);
- wireless_security_unref (sec);
- return nag;
- }
-
- return NULL;
-}
-
static void
nma_wifi_dialog_init (NMAWifiDialog *self)
{
diff --git a/src/libnm-gtk/nm-wifi-dialog.h b/src/libnm-gtk/nm-wifi-dialog.h
index 35554cb..3c33b34 100644
--- a/src/libnm-gtk/nm-wifi-dialog.h
+++ b/src/libnm-gtk/nm-wifi-dialog.h
@@ -71,11 +71,5 @@ NMConnection * nma_wifi_dialog_get_connection (NMAWifiDialog *self,
NMDevice **device,
NMAccessPoint **ap);
-GtkWidget * nma_wifi_dialog_nag_user (NMAWifiDialog *self);
-
-void nma_wifi_dialog_set_nag_ignored (NMAWifiDialog *self, gboolean ignored);
-
-gboolean nma_wifi_dialog_get_nag_ignored (NMAWifiDialog *self);
-
#endif /* NMA_WIFI_DIALOG_H */
diff --git a/src/libnm-gtk/nm-wireless-dialog.c b/src/libnm-gtk/nm-wireless-dialog.c
index 38882af..15c370a 100644
--- a/src/libnm-gtk/nm-wireless-dialog.c
+++ b/src/libnm-gtk/nm-wireless-dialog.c
@@ -33,18 +33,6 @@ nma_wireless_dialog_get_type (void)
return nma_wifi_dialog_get_type ();
}
-void
-nma_wireless_dialog_set_nag_ignored (NMAWirelessDialog *self, gboolean ignored)
-{
- nma_wifi_dialog_set_nag_ignored ((NMAWifiDialog *)self, ignored);
-}
-
-gboolean
-nma_wireless_dialog_get_nag_ignored (NMAWirelessDialog *self)
-{
- return nma_wifi_dialog_get_nag_ignored ((NMAWifiDialog *)self);
-}
-
NMConnection *
nma_wireless_dialog_get_connection (NMAWirelessDialog *self,
NMDevice **out_device,
@@ -76,8 +64,3 @@ nma_wireless_dialog_new_for_create (NMClient *client, NMRemoteSettings *settings
return nma_wifi_dialog_new_for_create (client, settings);
}
-GtkWidget *
-nma_wireless_dialog_nag_user (NMAWirelessDialog *self)
-{
- return nma_wifi_dialog_nag_user ((NMAWifiDialog *)self);
-}
diff --git a/src/libnm-gtk/nm-wireless-dialog.h b/src/libnm-gtk/nm-wireless-dialog.h
index 4e487c4..7c48166 100644
--- a/src/libnm-gtk/nm-wireless-dialog.h
+++ b/src/libnm-gtk/nm-wireless-dialog.h
@@ -76,14 +76,5 @@ NMConnection * nma_wireless_dialog_get_connection (NMAWirelessDialog *dialog,
NMDevice **device,
NMAccessPoint **ap);
-GLIB_DEPRECATED_FOR(nma_wifi_dialog_nag_user)
-GtkWidget * nma_wireless_dialog_nag_user (NMAWirelessDialog *dialog);
-
-GLIB_DEPRECATED_FOR(nma_wifi_dialog_set_nag_ignored)
-void nma_wireless_dialog_set_nag_ignored (NMAWirelessDialog *dialog, gboolean ignored);
-
-GLIB_DEPRECATED_FOR(nma_wifi_dialog_get_nag_ignored)
-gboolean nma_wireless_dialog_get_nag_ignored (NMAWirelessDialog *dialog);
-
#endif /* NMA_WIRELESS_DIALOG_H */
diff --git a/src/wireless-security/Makefile.am b/src/wireless-security/Makefile.am
index 5f47fcf..f8098f7 100644
--- a/src/wireless-security/Makefile.am
+++ b/src/wireless-security/Makefile.am
@@ -50,7 +50,6 @@ ui_DATA = \
eap-method-simple.ui \
eap-method-tls.ui \
eap-method-ttls.ui \
- nag-user-dialog.ui \
ws-dynamic-wep.ui \
ws-leap.ui \
ws-wep-key.ui \
diff --git a/src/wireless-security/eap-method-peap.c b/src/wireless-security/eap-method-peap.c
index f4ec4f4..d8ade3c 100644
--- a/src/wireless-security/eap-method-peap.c
+++ b/src/wireless-security/eap-method-peap.c
@@ -348,8 +348,6 @@ eap_method_peap_new (WirelessSecurity *ws_parent,
if (!parent)
return NULL;
- eap_method_nag_init (parent, "eap_peap_ca_cert_button", connection);
-
method = (EAPMethodPEAP *) parent;
method->sec_parent = ws_parent;
method->is_editor = is_editor;
diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c
index db34dd0..4301fe8 100644
--- a/src/wireless-security/eap-method-tls.c
+++ b/src/wireless-security/eap-method-tls.c
@@ -431,8 +431,6 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
method = (EAPMethodTLS *) parent;
method->new_connection = secrets_only ? FALSE : TRUE;
- eap_method_nag_init (parent, "eap_tls_ca_cert_button", connection);
-
if (connection)
s_8021x = nm_connection_get_setting_802_1x (connection);
diff --git a/src/wireless-security/eap-method-ttls.c b/src/wireless-security/eap-method-ttls.c
index b2ba58a..b071971 100644
--- a/src/wireless-security/eap-method-ttls.c
+++ b/src/wireless-security/eap-method-ttls.c
@@ -352,8 +352,6 @@ eap_method_ttls_new (WirelessSecurity *ws_parent,
if (!parent)
return NULL;
- eap_method_nag_init (parent, "eap_ttls_ca_cert_button", connection);
-
method = (EAPMethodTTLS *) parent;
method->sec_parent = ws_parent;
method->is_editor = is_editor;
diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c
index 45da69d..f0a65e2 100644
--- a/src/wireless-security/eap-method.c
+++ b/src/wireless-security/eap-method.c
@@ -98,197 +98,6 @@ eap_method_update_secrets (EAPMethod *method, NMConnection *connection)
method->update_secrets (method, connection);
}
-typedef struct {
- EAPMethod *method;
- NMConnection *connection;
-} NagDialogResponseInfo;
-
-static void
-nag_dialog_destroyed (gpointer data, GObject *dialog_ptr)
-{
- NagDialogResponseInfo *info = (NagDialogResponseInfo *) data;
-
- memset (info, '\0', sizeof (NagDialogResponseInfo));
- g_free (info);
-}
-
-static GSettings *
-_get_ca_ignore_settings (const char *uuid)
-{
- GSettings *settings;
- char *path = NULL;
-
- path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s", uuid);
- settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path);
- g_free (path);
-
- return settings;
-}
-
-static void
-_set_ignore_ca_cert (const char *uuid, gboolean phase2, gboolean ignore)
-{
- GSettings *settings;
- const char *key;
-
- g_return_if_fail (uuid != NULL);
-
- settings = _get_ca_ignore_settings (uuid);
- key = phase2 ? "ignore-phase2-ca-cert" : "ignore-ca-cert";
- g_settings_set_boolean (settings, key, ignore);
- g_object_unref (settings);
-}
-
-static void
-nag_dialog_response_cb (GtkDialog *nag_dialog,
- gint response,
- gpointer user_data)
-{
- NagDialogResponseInfo *info = (NagDialogResponseInfo *) user_data;
- EAPMethod *method = (EAPMethod *) info->method;
- NMConnection *connection = (NMConnection *) info->connection;
- GtkWidget *widget;
-
- if (response == GTK_RESPONSE_NO) {
- /* Grab the value of the "don't bother me" checkbox */
- widget = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "ignore_checkbox"));
- g_assert (widget);
-
- method->ignore_ca_cert = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-
- /* And save it */
- _set_ignore_ca_cert (nm_connection_get_uuid (connection),
- method->phase2,
- method->ignore_ca_cert);
- }
-
- gtk_widget_hide (GTK_WIDGET (nag_dialog));
-}
-
-static gboolean
-nag_dialog_delete_event_cb (GtkDialog *nag_dialog, GdkEvent *e, gpointer user_data)
-{
- // FIXME?: By emitting response signal, dismissing nag dialog with upper right "x" icon,
- // Alt-F4, or Esc would have the same behaviour as clicking "Ignore" button.
- //g_signal_emit_by_name (nag_dialog, "response", GTK_RESPONSE_NO, user_data);
- return TRUE; /* do not destroy */
-}
-
-GtkWidget *
-eap_method_nag_user (EAPMethod *method)
-{
- GtkWidget *widget;
- char *filename = NULL;
-
- g_return_val_if_fail (method != NULL, NULL);
-
- if (!method->nag_dialog || method->ignore_ca_cert)
- return NULL;
-
- /* Checkbox should be unchecked each time dialog comes up */
- widget = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "ignore_checkbox"));
- g_assert (widget);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
-
- /* Nag the user if the CA Cert is blank, since it's a security risk. */
- widget = GTK_WIDGET (gtk_builder_get_object (method->builder, method->ca_cert_chooser));
- g_assert (widget);
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
- if (filename != NULL) {
- g_free (filename);
- return NULL;
- }
-
- gtk_window_present (GTK_WINDOW (method->nag_dialog));
- return method->nag_dialog;
-}
-
-#define NAG_DIALOG_UI UIDIR "/nag-user-dialog.ui"
-
-static gboolean
-_get_ignore_ca_cert (const char *uuid, gboolean phase2)
-{
- GSettings *settings;
- const char *key;
- gboolean ignore = FALSE;
-
- g_return_val_if_fail (uuid != NULL, FALSE);
-
- settings = _get_ca_ignore_settings (uuid);
-
- key = phase2 ? "ignore-phase2-ca-cert" : "ignore-ca-cert";
- ignore = g_settings_get_boolean (settings, key);
-
- g_object_unref (settings);
- return ignore;
-}
-
-gboolean
-eap_method_nag_init (EAPMethod *method,
- const char *ca_cert_chooser,
- NMConnection *connection)
-{
- GtkWidget *dialog, *widget;
- NagDialogResponseInfo *info;
- GError *error = NULL;
- char *text;
-
- g_return_val_if_fail (method != NULL, FALSE);
- g_return_val_if_fail (ca_cert_chooser != NULL, FALSE);
-
- method->nag_builder = gtk_builder_new ();
- if (!gtk_builder_add_from_file (method->nag_builder, NAG_DIALOG_UI, &error)) {
- g_warning ("Couldn't load UI builder file " NAG_DIALOG_UI ": %s",
- error->message);
- g_error_free (error);
- return FALSE;
- }
-
- method->ca_cert_chooser = g_strdup (ca_cert_chooser);
- if (connection) {
- NMSettingConnection *s_con;
- const char *uuid;
-
- s_con = nm_connection_get_setting_connection (connection);
- g_assert (s_con);
- uuid = nm_setting_connection_get_uuid (s_con);
- g_assert (uuid);
-
- /* Figure out if the user wants to ignore missing CA cert */
- method->ignore_ca_cert = _get_ignore_ca_cert (uuid, method->phase2);
- }
-
- info = g_malloc0 (sizeof (NagDialogResponseInfo));
- info->method = method;
- info->connection = connection;
-
- dialog = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "nag_user_dialog"));
- g_assert (dialog);
- g_signal_connect (dialog, "response", G_CALLBACK (nag_dialog_response_cb), info);
- g_signal_connect (dialog, "delete-event", G_CALLBACK (nag_dialog_delete_event_cb), info);
- g_object_weak_ref (G_OBJECT (dialog), nag_dialog_destroyed, info);
-
- widget = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "content_label"));
- g_assert (widget);
-
- text = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
- _("No Certificate Authority certificate chosen"),
- _("Not using a Certificate Authority (CA) certificate can result in
connections to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate Authority
certificate?"));
- gtk_label_set_markup (GTK_LABEL (widget), text);
- g_free (text);
-
- widget = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "ignore_button"));
- gtk_button_set_label (GTK_BUTTON (widget), _("Ignore"));
- g_assert (widget);
-
- widget = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "change_button"));
- gtk_button_set_label (GTK_BUTTON (widget), _("Choose CA Certificate"));
- g_assert (widget);
-
- method->nag_dialog = dialog;
- return TRUE;
-}
-
void
eap_method_phase2_update_secrets_helper (EAPMethod *method,
NMConnection *connection,
@@ -395,11 +204,6 @@ eap_method_unref (EAPMethod *method)
if (method->destroy)
method->destroy (method);
- if (method->nag_dialog)
- gtk_widget_destroy (method->nag_dialog);
- if (method->nag_builder)
- g_object_unref (method->nag_builder);
- g_free (method->ca_cert_chooser);
if (method->builder)
g_object_unref (method->builder);
if (method->ui_widget)
diff --git a/src/wireless-security/eap-method.h b/src/wireless-security/eap-method.h
index d2be1f3..70fc0c4 100644
--- a/src/wireless-security/eap-method.h
+++ b/src/wireless-security/eap-method.h
@@ -44,14 +44,10 @@ struct _EAPMethod {
GtkBuilder *builder;
GtkWidget *ui_widget;
- GtkBuilder *nag_builder;
- char *ca_cert_chooser;
const char *default_field;
- GtkWidget *nag_dialog;
gboolean phase2;
gboolean secrets_only;
- gboolean ignore_ca_cert;
EMAddToSizeGroupFunc add_to_size_group;
EMFillConnectionFunc fill_connection;
@@ -73,8 +69,6 @@ void eap_method_fill_connection (EAPMethod *method, NMConnection *connection);
void eap_method_update_secrets (EAPMethod *method, NMConnection *connection);
-GtkWidget * eap_method_nag_user (EAPMethod *method);
-
EAPMethod *eap_method_ref (EAPMethod *method);
void eap_method_unref (EAPMethod *method);
@@ -115,10 +109,6 @@ gboolean eap_method_validate_filepicker (GtkBuilder *builder,
const char *password,
NMSetting8021xCKFormat *out_format);
-gboolean eap_method_nag_init (EAPMethod *method,
- const char *ca_cert_chooser,
- NMConnection *connection);
-
void eap_method_phase2_update_secrets_helper (EAPMethod *method,
NMConnection *connection,
const char *combo_name,
diff --git a/src/wireless-security/wireless-security.c b/src/wireless-security/wireless-security.c
index 82de85b..5441c35 100644
--- a/src/wireless-security/wireless-security.c
+++ b/src/wireless-security/wireless-security.c
@@ -208,16 +208,6 @@ wireless_security_init (gsize obj_size,
return sec;
}
-GtkWidget *
-wireless_security_nag_user (WirelessSecurity *sec)
-{
- g_return_val_if_fail (sec != NULL, NULL);
-
- if (sec->nag_user)
- return (*(sec->nag_user)) (sec);
- return NULL;
-}
-
gboolean
wireless_security_adhoc_compatible (WirelessSecurity *sec)
{
@@ -556,23 +546,3 @@ ws_802_1x_update_secrets (WirelessSecurity *sec,
}
}
-GtkWidget *
-ws_802_1x_nag_user (WirelessSecurity *sec,
- const char *combo_name)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
- EAPMethod *eap = NULL;
- GtkWidget *widget;
-
- widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, combo_name));
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
- gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter);
- gtk_tree_model_get (model, &iter, AUTH_METHOD_COLUMN, &eap, -1);
- g_return_val_if_fail (eap != NULL, NULL);
-
- widget = eap_method_nag_user (eap);
- eap_method_unref (eap);
- return widget;
-}
-
diff --git a/src/wireless-security/wireless-security.h b/src/wireless-security/wireless-security.h
index 78f4124..45ecf83 100644
--- a/src/wireless-security/wireless-security.h
+++ b/src/wireless-security/wireless-security.h
@@ -56,7 +56,6 @@ struct _WirelessSecurity {
WSFillConnectionFunc fill_connection;
WSUpdateSecretsFunc update_secrets;
WSValidateFunc validate;
- WSNagUserFunc nag_user;
WSDestroyFunc destroy;
};
@@ -80,8 +79,6 @@ void wireless_security_fill_connection (WirelessSecurity *sec,
void wireless_security_update_secrets (WirelessSecurity *sec,
NMConnection *connection);
-GtkWidget * wireless_security_nag_user (WirelessSecurity *sec);
-
gboolean wireless_security_adhoc_compatible (WirelessSecurity *sec);
void wireless_security_set_userpass (WirelessSecurity *sec,
@@ -149,8 +146,5 @@ void ws_802_1x_update_secrets (WirelessSecurity *sec,
const char *combo_name,
NMConnection *connection);
-GtkWidget * ws_802_1x_nag_user (WirelessSecurity *sec,
- const char *combo_name);
-
#endif /* WIRELESS_SECURITY_H */
diff --git a/src/wireless-security/ws-dynamic-wep.c b/src/wireless-security/ws-dynamic-wep.c
index 7d9ea3a..d492946 100644
--- a/src/wireless-security/ws-dynamic-wep.c
+++ b/src/wireless-security/ws-dynamic-wep.c
@@ -94,12 +94,6 @@ auth_combo_changed_cb (GtkWidget *combo, gpointer user_data)
sec->size_group);
}
-static GtkWidget *
-nag_user (WirelessSecurity *parent)
-{
- return ws_802_1x_nag_user (parent, "dynamic_wep_auth_combo");
-}
-
static void
update_secrets (WirelessSecurity *parent, NMConnection *connection)
{
@@ -126,7 +120,6 @@ ws_dynamic_wep_new (NMConnection *connection,
if (!parent)
return NULL;
- parent->nag_user = nag_user;
parent->adhoc_compatible = FALSE;
widget = ws_802_1x_auth_combo_init (parent,
diff --git a/src/wireless-security/ws-wpa-eap.c b/src/wireless-security/ws-wpa-eap.c
index d0dad00..6b911c1 100644
--- a/src/wireless-security/ws-wpa-eap.c
+++ b/src/wireless-security/ws-wpa-eap.c
@@ -90,12 +90,6 @@ auth_combo_changed_cb (GtkWidget *combo, gpointer user_data)
sec->size_group);
}
-static GtkWidget *
-nag_user (WirelessSecurity *parent)
-{
- return ws_802_1x_nag_user (parent, "wpa_eap_auth_combo");
-}
-
static void
update_secrets (WirelessSecurity *parent, NMConnection *connection)
{
@@ -122,7 +116,6 @@ ws_wpa_eap_new (NMConnection *connection,
if (!parent)
return NULL;
- parent->nag_user = nag_user;
parent->adhoc_compatible = FALSE;
widget = ws_802_1x_auth_combo_init (parent,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
