# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1095028435 0
# Node ID 2f41f462ab4e812a33d7c6ba8b9f52218effbc88
# Parent  c06c4a697b31248a8fe9c681a5166275af173241
[gaim-migrate @ 10946]
This should be good for now.  It's taking forever to compile, so I'll fix
eventloop.h and roomlist.h when I get back.

committer: Tailor Script <tailor@pidgin.im>

diff -r c06c4a697b31 -r 2f41f462ab4e src/account.h
--- a/src/account.h	Sun Sep 12 21:37:59 2004 +0000
+++ b/src/account.h	Sun Sep 12 22:33:55 2004 +0000
@@ -27,7 +27,7 @@
 #ifndef _GAIM_ACCOUNT_H_
 #define _GAIM_ACCOUNT_H_
 
-#include "internal.h"
+#include <glib.h>
 
 typedef struct _GaimAccountUiOps GaimAccountUiOps;
 typedef struct _GaimAccount      GaimAccount;
diff -r c06c4a697b31 -r 2f41f462ab4e src/connection.h
--- a/src/connection.h	Sun Sep 12 21:37:59 2004 +0000
+++ b/src/connection.h	Sun Sep 12 22:33:55 2004 +0000
@@ -53,8 +53,9 @@
 
 } GaimConnectionState;
 
+#include <time.h>
+
 #include "account.h"
-#include "internal.h"
 #include "plugin.h"
 
 typedef struct
diff -r c06c4a697b31 -r 2f41f462ab4e src/protocols/oscar/aim.h
--- a/src/protocols/oscar/aim.h	Sun Sep 12 21:37:59 2004 +0000
+++ b/src/protocols/oscar/aim.h	Sun Sep 12 22:33:55 2004 +0000
@@ -59,7 +59,7 @@
  */
 #ifdef WIN32_INDLL
 #define faim_export __declspec(dllexport)
-#else 
+#else
 #define faim_export __declspec(dllimport)
 #endif /* WIN32_INDLL */
 #define faim_internal
@@ -323,7 +323,7 @@
 	void *priv; /* misc data the client may want to store */
 	void *internal; /* internal conn-specific libfaim data */
 	time_t lastactivity; /* time of last transmit */
-	int forcedlatency; 
+	int forcedlatency;
 	void *handlerlist;
 	void *sessv; /* pointer to parent session */
 	void *inside; /* only accessible from inside libfaim */
@@ -353,9 +353,9 @@
 typedef struct aim_frame_s {
 	fu8_t hdrtype; /* defines which piece of the union to use */
 	union {
-		struct { 
+		struct {
 			fu8_t channel;
-			flap_seqnum_t seqnum;     
+			flap_seqnum_t seqnum;
 		} flap;
 		struct {
 			fu8_t magic[4];	/* ODC2 or OFT2 */
@@ -412,7 +412,7 @@
 	 *  
 	 */
 	aim_frame_t *queue_outgoing;
-	aim_frame_t *queue_incoming; 
+	aim_frame_t *queue_incoming;
 
 	/*
 	 * Tx Enqueuing function.
@@ -780,7 +780,7 @@
 	/* Always provided */
 	aim_mpmsg_t mpmsg;
 	fu32_t icbmflags; /* some flags apply only to ->msg, not all mpmsg */
-	
+
 	/* Only provided if message has a human-readable section */
 	char *msg;
 	int msglen;