[network-manager-applet/th/proxy-bgo621767] fixup! nm-c-e/proxy: Support proxy handling similar to nmcli.
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/th/proxy-bgo621767] fixup! nm-c-e/proxy: Support proxy handling similar to nmcli.
- Date: Tue, 6 Dec 2016 21:16:30 +0000 (UTC)
commit edad8404a78c054d322aff5e54e345afb293893c
Author: Thomas Haller <thaller redhat com>
Date: Tue Dec 6 22:11:24 2016 +0100
fixup! nm-c-e/proxy: Support proxy handling similar to nmcli.
https://bugzilla.gnome.org/show_bug.cgi?id=621767#c10
src/connection-editor/page-proxy.c | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/src/connection-editor/page-proxy.c b/src/connection-editor/page-proxy.c
index af0c2e5..0772fea 100644
--- a/src/connection-editor/page-proxy.c
+++ b/src/connection-editor/page-proxy.c
@@ -121,19 +121,10 @@ import_button_clicked_cb (GtkWidget *widget, CEPageProxy *self)
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
- if (!filename) {
- g_warning ("%s: didn't get a filename back from the chooser!", __func__);
+ if (!filename)
goto out;
- }
g_file_get_contents (filename, &script, &len, NULL);
- if ( len > 100000
- || !strstr (script, "FindProxyForURL")
- || !g_utf8_validate (script, -1, NULL)) {
- g_free (script);
- script = NULL;
- }
-
buffer = gtk_text_view_get_buffer (priv->pac_script_window);
gtk_text_buffer_set_text (buffer, script ? script : "", -1);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]