changeset 25996:349e411da2ce

Rearrange the structs and fix the indentation. No functional changes.
author Paul Aurich <paul@darkrain42.org>
date Mon, 16 Mar 2009 06:38:24 +0000
parents e995540378f0
children c605e5f2fc99
files libpurple/protocols/jabber/bosh.c
diffstat 1 files changed, 26 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/bosh.c	Mon Mar 16 06:32:55 2009 +0000
+++ b/libpurple/protocols/jabber/bosh.c	Mon Mar 16 06:38:24 2009 +0000
@@ -44,44 +44,46 @@
 } PurpleBOSHPacketType;
 
 struct _PurpleBOSHConnection {
-    /* decoded URL */
-    char *host;
-    int port;
-    char *path; 
-
-    /* Must be big enough to hold 2^53 - 1 */
-    guint64 rid;
-    char *sid;
-    int wait;
-
-    JabberStream *js;
-    gboolean pipelining;
+	JabberStream *js;
+	gboolean pipelining;
 	PurpleHTTPConnection *connections[MAX_HTTP_CONNECTIONS];
 
-	unsigned int inactivity_timer;
+	gboolean ready;
+
+	/* decoded URL */
+	char *host;
+	int port;
+	char *path; 
 
+	/* Must be big enough to hold 2^53 - 1 */
+	guint64 rid;
+	char *sid;
+
+	unsigned int inactivity_timer;
 	int max_inactivity;
+	int wait;
+
+	GString *pending;
 	int max_requests;
 	int requests;
-	GString *pending;
 
-    gboolean ready;
-    PurpleBOSHConnectionConnectFunction connect_cb;
-    PurpleBOSHConnectionReceiveFunction receive_cb;
+	PurpleBOSHConnectionConnectFunction connect_cb;
+	PurpleBOSHConnectionReceiveFunction receive_cb;
 };
 
 struct _PurpleHTTPConnection {
-    int fd;
+	PurpleBOSHConnection *bosh;
+	int fd;
+	int ie_handle;
+
 	gboolean ready;
-    int ie_handle;
 	int requests; /* number of outstanding HTTP requests */
 
-    GString *buf;
-    gboolean headers_done;
-    gsize handled_len;
-    gsize body_len;
+	GString *buf;
+	gboolean headers_done;
+	gsize handled_len;
+	gsize body_len;
 
-    PurpleBOSHConnection *bosh;
 };
 
 static void jabber_bosh_connection_stream_restart(PurpleBOSHConnection *conn);