aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog7
-rw-r--r--e-util/Makefile.am2
-rw-r--r--e-util/e-proxy.c96
-rw-r--r--e-util/e-proxy.h38
4 files changed, 7 insertions, 136 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index b6bdedd004..482e345fc2 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-22 Dan Winship <danw@ximian.com>
+
+ * e-proxy.[ch]: Gone; nothing in evo uses soup any more.
+
+ * Makefile.am (eutilinclude_HEADERS, libeutil_la_SOURCES): Remove
+ e-proxy.[ch]
+
2003-10-20 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am (pilot_compile) [! ENABLE_PILOT_CONDUITS]: Add
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index f80e321f0e..3b54533b4f 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -41,7 +41,6 @@ eutilinclude_HEADERS = \
e-msgport.h \
e-passwords.h \
e-path.h \
- e-proxy.h \
e-request.h \
e-sexp.h \
e-source-group.h \
@@ -79,7 +78,6 @@ libeutil_la_SOURCES = \
e-msgport.c \
e-passwords.c \
e-path.c \
- e-proxy.c \
e-request.c \
e-sexp.c \
e-source-group.c \
diff --git a/e-util/e-proxy.c b/e-util/e-proxy.c
deleted file mode 100644
index 4ffbeb94a2..0000000000
--- a/e-util/e-proxy.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-
-#include <libsoup/soup.h>
-
-#include "e-proxy.h"
-
-static void
-set_proxy (GConfClient *client)
-{
- SoupContext *context;
- char *proxy_server, *proxy_user, *proxy_pw, *uri;
- gboolean use_auth, use_proxy;
- int proxy_port;
-
- use_proxy = gconf_client_get_bool (client, "/system/http_proxy/use_http_proxy", NULL);
- if (use_proxy == FALSE) {
- return;
- }
-
- proxy_server = gconf_client_get_string (client, "/system/http_proxy/host", NULL);
- proxy_port = gconf_client_get_int (client, "/system/http_proxy/port", NULL);
-
- use_auth = gconf_client_get_bool (client, "/system/http_proxy/use_authentication", NULL);
- if (use_auth == TRUE) {
- proxy_user = gconf_client_get_string (client, "/system/http_proxy/authentication_user", NULL);
- proxy_pw = gconf_client_get_string (client, "/system/http_proxy/authentication_password", NULL);
-
- uri = g_strdup_printf ("http://%s:%s@%s:%d", proxy_user, proxy_pw, proxy_server, proxy_port);
- } else {
- uri = g_strdup_printf ("http://%s:%d", proxy_server, proxy_port);
- }
-
- context = soup_context_get (uri);
- soup_set_proxy (context);
- soup_context_unref (context);
- g_free (uri);
-}
-
-static void
-proxy_setting_changed (GConfClient *client, guint32 cnxn_id,
- GConfEntry *entry, gpointer user_data)
-{
- set_proxy (client);
-}
-
-void
-e_proxy_init ()
-{
- GConfClient *client;
-
- /* We get the gnome-vfs proxy keys here
- set soup up to use the proxy,
- and listen to any changes */
-
- if (!(client = gconf_client_get_default ()))
- return;
-
- /* Listen to the changes in the gnome-vfs path */
- gconf_client_add_dir (client, "/system/http_proxy",
- GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-
- gconf_client_notify_add (client, "/system/http_proxy",
- proxy_setting_changed, NULL, NULL, NULL);
-
- set_proxy (client);
-}
diff --git a/e-util/e-proxy.h b/e-util/e-proxy.h
deleted file mode 100644
index 915592cef1..0000000000
--- a/e-util/e-proxy.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef __E_PROXY_H__
-#define __E_PROXY_H__
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-void e_proxy_init (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_PROXY_H__ */