From 8ddf38c40deea2da8cb931a7c718ba191472ef30 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 9 Jul 2009 17:54:21 +0000 Subject: [PATCH] - applet: fix certificate validation in hidden wifi networks dialog (rh #508207) --- NetworkManager.spec | 7 ++- nm-applet-file-chooser-validation.patch | 57 +++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 nm-applet-file-chooser-validation.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 8718e1d..f672b01 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -16,7 +16,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.1 -Release: 7%{snapshot}%{?dist} +Release: 8%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -26,6 +26,7 @@ Source1: network-manager-applet-%{version}%{applet_snapshot}.tar.bz2 Source2: nm-system-settings.conf Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch +Patch3: nm-applet-file-chooser-validation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -145,6 +146,7 @@ tar -xjf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 +%patch3 -p1 -b .file-chooser-validate %build @@ -325,6 +327,9 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Thu Jul 9 2009 Dan Williams - 0.7.1-8.git20090708 +- applet: fix certificate validation in hidden wifi networks dialog (rh #508207) + * Wed Jul 8 2009 Dan Williams - 0.7.1-7.git20090708 - nm: fixes for ZTE/Onda modem detection - nm: prevent re-opening serial port when the SIM has a PIN diff --git a/nm-applet-file-chooser-validation.patch b/nm-applet-file-chooser-validation.patch new file mode 100644 index 0000000..bca5a73 --- /dev/null +++ b/nm-applet-file-chooser-validation.patch @@ -0,0 +1,57 @@ +commit 16b389e00a828cfc114cfc0bcaa64d9e247fd890 +Author: Dan Williams +Date: Thu Jul 9 13:37:50 2009 -0400 + + eap: fix file chooser button validation + + file-set only emits on /user/ initiated events, not for example when + the file chooser has finally completed the async file operations after + gtk_file_chooser_set_filename(). + +diff --git a/network-manager-applet-0.7.1/src/wireless-security/eap-method-peap.c b/network-manager-applet-0.7.1/src/wireless-security/eap-method-peap.c +index 8d82fee..d9f4f46 100644 +--- a/network-manager-applet-0.7.1/src/wireless-security/eap-method-peap.c ++++ b/network-manager-applet-0.7.1/src/wireless-security/eap-method-peap.c +@@ -309,7 +309,7 @@ eap_method_peap_new (const char *glade_file, + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE); + gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget), + _("Choose a Certificate Authority certificate...")); +- g_signal_connect (G_OBJECT (widget), "file-set", ++ g_signal_connect (G_OBJECT (widget), "selection-changed", + (GCallback) wireless_security_changed_cb, + parent); + filter = eap_method_default_file_chooser_filter_new (FALSE); +diff --git a/network-manager-applet-0.7.1/src/wireless-security/eap-method-tls.c b/network-manager-applet-0.7.1/src/wireless-security/eap-method-tls.c +index 7d78d07..6912427 100644 +--- a/network-manager-applet-0.7.1/src/wireless-security/eap-method-tls.c ++++ b/network-manager-applet-0.7.1/src/wireless-security/eap-method-tls.c +@@ -311,14 +311,14 @@ setup_filepicker (GladeXML *xml, + * and desensitize the user cert button. + */ + if (privkey) { +- g_signal_connect (G_OBJECT (widget), "file-set", ++ g_signal_connect (G_OBJECT (widget), "selection-changed", + (GCallback) private_key_picker_file_set_cb, + method); + if (filename) + private_key_picker_helper ((EAPMethod *) method, filename, FALSE); + } + +- g_signal_connect (G_OBJECT (widget), "file-set", ++ g_signal_connect (G_OBJECT (widget), "selection-changed", + (GCallback) wireless_security_changed_cb, + parent); + +diff --git a/network-manager-applet-0.7.1/src/wireless-security/eap-method-ttls.c b/network-manager-applet-0.7.1/src/wireless-security/eap-method-ttls.c +index b455fc8..78d0f80 100644 +--- a/network-manager-applet-0.7.1/src/wireless-security/eap-method-ttls.c ++++ b/network-manager-applet-0.7.1/src/wireless-security/eap-method-ttls.c +@@ -341,7 +341,7 @@ eap_method_ttls_new (const char *glade_file, + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE); + gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget), + _("Choose a Certificate Authority certificate...")); +- g_signal_connect (G_OBJECT (widget), "file-set", ++ g_signal_connect (G_OBJECT (widget), "selection-changed", + (GCallback) wireless_security_changed_cb, + parent); + filter = eap_method_default_file_chooser_filter_new (FALSE);