Remove old #include of http header and its init.

22 files changed, 0 insertions, 27 deletions

diff --git a/ChangeLog.API b/ChangeLog.API
index 77b58a2f7c..87dfbbd9bc 100644
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -417,8 +417,6 @@ version 3.0.0 (??/??/????):
 		* PurpleEventLoopUiOps. Manually drive the GLib event loop
 		  yourself. See GLib Main Event Loop docs.
 		* purple_get_tzoff_str(). Use g_date_time_format, instead.
-		* purple_http_digest_calculate_response
-		* purple_http_digest_calculate_session_key
 		* purple_ip_address_is_valid, purple_ipv4_address_is_valid, and
 		  purple_ipv6_address_is_valid. Use g_hostname_is_ip_address()
 		  or #GInetAddress instead.
diff --git a/finch/plugins/gnttinyurl.c b/finch/plugins/gnttinyurl.c
index 6c04b77ed1..d463cc0ea0 100644
--- a/finch/plugins/gnttinyurl.c
+++ b/finch/plugins/gnttinyurl.c
@@ -26,7 +26,6 @@
 #define PREF_URL  PREFS_BASE "/url"
 
 #include <conversation.h>
-#include <http.h>
 #include <signals.h>
 
 #include <glib.h>
diff --git a/libpurple/connection.c b/libpurple/connection.c
index ab08be542e..eae34dfbe7 100644
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -27,7 +27,6 @@
 #include "connection.h"
 #include "debug.h"
 #include "enums.h"
-#include "http.h"
 #include "log.h"
 #include "notify.h"
 #include "prefs.h"
@@ -875,7 +874,6 @@ purple_connection_finalize(GObject *object)
 		buddies = g_slist_delete_link(buddies, buddies);
 	}
 
-	purple_http_conn_cancel_all(gc);
 	purple_proxy_connect_cancel_with_handle(gc);
 
 	connections = g_list_remove(connections, gc);
diff --git a/libpurple/core.c b/libpurple/core.c
index ef5513b895..a59ac139dc 100644
--- a/libpurple/core.c
+++ b/libpurple/core.c
@@ -26,7 +26,6 @@
 #include "debug.h"
 #include "xfer.h"
 #include "glibcompat.h"
-#include "http.h"
 #include "idle.h"
 #include "image-store.h"
 #include "keyring.h"
@@ -177,7 +176,6 @@ purple_core_init(const char *ui)
 	purple_stun_init();
 	purple_xfers_init();
 	purple_idle_init();
-	purple_http_init();
 	_purple_smiley_custom_init();
 	_purple_smiley_parser_init();
 
@@ -219,7 +217,6 @@ purple_core_quit(void)
 	_purple_smiley_theme_uninit();
 	_purple_smiley_custom_uninit();
 	_purple_smiley_parser_uninit();
-	purple_http_uninit();
 	purple_idle_uninit();
 	purple_pounces_uninit();
 	purple_conversations_uninit();
diff --git a/libpurple/protocols/facebook/http.h b/libpurple/protocols/facebook/http.h
index ad987c6aeb..3396fccffe 100644
--- a/libpurple/protocols/facebook/http.h
+++ b/libpurple/protocols/facebook/http.h
@@ -34,8 +34,6 @@
 #include <glib.h>
 #include <libsoup/soup.h>
 
-#include <libpurple/http.h>
-
 /**
  * FB_HTTP_ERROR:
  *
diff --git a/libpurple/protocols/gg/avatar.c b/libpurple/protocols/gg/avatar.c
index c6a8d2be3a..e7cd0bf7d6 100644
--- a/libpurple/protocols/gg/avatar.c
+++ b/libpurple/protocols/gg/avatar.c
@@ -31,7 +31,6 @@
 
 #include <debug.h>
 #include <glibcompat.h>
-#include <http.h>
 
 #include "gg.h"
 #include "utils.h"
diff --git a/libpurple/protocols/gg/edisc.c b/libpurple/protocols/gg/edisc.c
index 82633a1344..180b87be0a 100644
--- a/libpurple/protocols/gg/edisc.c
+++ b/libpurple/protocols/gg/edisc.c
@@ -33,7 +33,6 @@
 #include "gg.h"
 #include "libgaduw.h"
 #include "utils.h"
-#include <http.h>
 
 #include <json-glib/json-glib.h>
 
diff --git a/libpurple/protocols/gg/oauth/oauth-purple.c b/libpurple/protocols/gg/oauth/oauth-purple.c
index df4dba2bfc..4e12aa47d2 100644
--- a/libpurple/protocols/gg/oauth/oauth-purple.c
+++ b/libpurple/protocols/gg/oauth/oauth-purple.c
@@ -35,7 +35,6 @@
 #include "../xml.h"
 
 #include <debug.h>
-#include <http.h>
 
 #define GGP_OAUTH_RESPONSE_MAX 10240
 
diff --git a/libpurple/protocols/gg/pubdir-prpl.c b/libpurple/protocols/gg/pubdir-prpl.c
index 76804e21b9..5243aaa39b 100644
--- a/libpurple/protocols/gg/pubdir-prpl.c
+++ b/libpurple/protocols/gg/pubdir-prpl.c
@@ -31,7 +31,6 @@
 #include "gg.h"
 
 #include <debug.h>
-#include <http.h>
 #include <request.h>
 
 #include "oauth/oauth-purple.h"
diff --git a/libpurple/protocols/jabber/bosh.c b/libpurple/protocols/jabber/bosh.c
index 080888ec6a..0537b5dd87 100644
--- a/libpurple/protocols/jabber/bosh.c
+++ b/libpurple/protocols/jabber/bosh.c
@@ -23,7 +23,6 @@
 #include "internal.h"
 #include "core.h"
 #include "debug.h"
-#include "http.h"
 
 #include <libsoup/soup.h>
 
diff --git a/libpurple/protocols/jabber/google/relay.c b/libpurple/protocols/jabber/google/relay.c
index 682758e021..01b8156c2f 100644
--- a/libpurple/protocols/jabber/google/relay.c
+++ b/libpurple/protocols/jabber/google/relay.c
@@ -20,7 +20,6 @@
 
 #include "internal.h"
 #include "debug.h"
-#include "http.h"
 
 #include "relay.h"
 
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index df92d84857..4914c65d50 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -29,7 +29,6 @@
 #include "connection.h"
 #include "conversation.h"
 #include "debug.h"
-#include "http.h"
 #include "message.h"
 #include "notify.h"
 #include "pluginpref.h"
diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
index 348d210b41..a459143016 100644
--- a/libpurple/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
@@ -64,7 +64,6 @@ typedef struct _JabberStream JabberStream;
 #include "attention.h"
 #include "circularbuffer.h"
 #include "connection.h"
-#include "http.h"
 #include "media.h"
 #include "mediamanager.h"
 #include "protocol.h"
diff --git a/libpurple/protocols/jabber/oob.c b/libpurple/protocols/jabber/oob.c
index 2698b5865a..ea945cae2f 100644
--- a/libpurple/protocols/jabber/oob.c
+++ b/libpurple/protocols/jabber/oob.c
@@ -23,7 +23,6 @@
 #include "internal.h"
 #include "debug.h"
 #include "xfer.h"
-#include "http.h"
 #include "util.h"
 
 #include "jabber.h"
diff --git a/libpurple/protocols/jabber/useravatar.c b/libpurple/protocols/jabber/useravatar.c
index e74e9bb85a..347383dfad 100644
--- a/libpurple/protocols/jabber/useravatar.c
+++ b/libpurple/protocols/jabber/useravatar.c
@@ -25,7 +25,6 @@
 
 #include <libsoup/soup.h>
 
-#include "http.h"
 #include "useravatar.h"
 #include "pep.h"
 #include "debug.h"
diff --git a/libpurple/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h
index 5e439f176b..5fb3efaeb7 100644
--- a/libpurple/protocols/oscar/oscar.h
+++ b/libpurple/protocols/oscar/oscar.h
@@ -33,7 +33,6 @@
 #include "circularbuffer.h"
 #include "debug.h"
 #include "eventloop.h"
-#include "http.h"
 #include "proxy.h"
 #include "sslconn.h"
 
diff --git a/libpurple/proxy.c b/libpurple/proxy.c
index 1083896c05..7d597cc6e6 100644
--- a/libpurple/proxy.c
+++ b/libpurple/proxy.c
@@ -27,7 +27,6 @@
 
 #include "internal.h"
 #include "debug.h"
-#include "http.h"
 #include "notify.h"
 #include "prefs.h"
 #include "proxy.h"
diff --git a/libpurple/upnp.c b/libpurple/upnp.c
index 308bc72d72..bd4a0c5cf1 100644
--- a/libpurple/upnp.c
+++ b/libpurple/upnp.c
@@ -27,7 +27,6 @@
 
 #include "debug.h"
 #include "eventloop.h"
-#include "http.h"
 #include "network.h"
 #include "proxy.h"
 #include "signals.h"
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index b423916dad..b2d22e7e65 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -26,7 +26,6 @@
 #include "pidgin.h"
 
 #include "debug.h"
-#include "http.h"
 #include "nat-pmp.h"
 #include "notify.h"
 #include "prefs.h"
diff --git a/pidgin/gtksmiley-manager.c b/pidgin/gtksmiley-manager.c
index 213bbeb019..1b4b45a461 100644
--- a/pidgin/gtksmiley-manager.c
+++ b/pidgin/gtksmiley-manager.c
@@ -23,7 +23,6 @@
 #include "internal.h"
 
 #include "debug.h"
-#include "http.h"
 #include "notify.h"
 #include "smiley.h"
 #include "smiley-custom.h"
diff --git a/pidgin/plugins/imgupload.c b/pidgin/plugins/imgupload.c
index 6d066a46d3..0e681915a4 100644
--- a/pidgin/plugins/imgupload.c
+++ b/pidgin/plugins/imgupload.c
@@ -23,7 +23,6 @@
 
 #include "debug.h"
 #include "glibcompat.h"
-#include "http.h"
 #include "version.h"
 
 #include "gtk3compat.h"
diff --git a/pidgin/plugins/relnot.c b/pidgin/plugins/relnot.c
index 2d1e0b0c5a..a179a6dd32 100644
--- a/pidgin/plugins/relnot.c
+++ b/pidgin/plugins/relnot.c
@@ -34,7 +34,6 @@
 #include "gtkblist.h"
 #include "gtkplugin.h"
 #include "gtkutils.h"
-#include "http.h"
 #include "notify.h"
 #include "pidginicon.h"
 #include "prefs.h"