/dev/tomkiewicz/gg11: 43a9bc15d15b: Merge default

[Tomasz Wasilczyk]

Changeset: 43a9bc15d15b400c12dbe3fc5e84e821c8888446
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2013-08-28 19:51 +0200
Branch:	 default
URL: https://hg.pidgin.im/dev/tomkiewicz/gg11/rev/43a9bc15d15b

Description:

Merge default

diffstat:

 libpurple/http.c |  21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diffs (45 lines):

diff --git a/libpurple/http.c b/libpurple/http.c
--- a/libpurple/http.c
+++ b/libpurple/http.c
@@ -70,7 +70,6 @@ struct _PurpleHttpSocket
 	PurpleProxyConnectData *raw_connection;
 	int fd;
 	guint inpa;
-	PurpleInputFunction watch_cb;
 	PurpleHttpSocketConnectCb connect_cb;
 	gpointer cb_data;
 };
@@ -574,6 +573,16 @@ purple_http_socket_write(PurpleHttpSocke
 }
 
 static void
+purple_http_socket_dontwatch(PurpleHttpSocket *hs)
+{
+	g_return_if_fail(hs != NULL);
+
+	if (hs->inpa > 0)
+		purple_input_remove(hs->inpa);
+	hs->inpa = 0;
+}
+
+static void
 purple_http_socket_watch(PurpleHttpSocket *hs, PurpleInputCondition cond,
 	PurpleInputFunction func, gpointer user_data)
 {
@@ -584,16 +593,6 @@ purple_http_socket_watch(PurpleHttpSocke
 }
 
 static void
-purple_http_socket_dontwatch(PurpleHttpSocket *hs)
-{
-	g_return_if_fail(hs != NULL);
-
-	if (hs->inpa > 0)
-		purple_input_remove(hs->inpa);
-	hs->inpa = 0;
-}
-
-static void
 purple_http_socket_close_free(PurpleHttpSocket *hs)
 {
 	if (hs == NULL)