# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1091975082 0
# Node ID 78022bad93678d65e79d7636d5176c4e0c0b0aa2
# Parent  f105bc0270c7c0ab3caee97ea055751c5ebf5685
[gaim-migrate @ 10579]
Fix some of those problems where one file needed to be included
before another.  Also, idle.c, server.c, sound.c and status.c
are core-esque files that have gtk stuff in them.  Most of it
deals with status.

committer: Tailor Script <tailor@pidgin.im>

diff -r f105bc0270c7 -r 78022bad9367 src/account.h
--- a/src/account.h	Sun Aug 08 14:21:30 2004 +0000
+++ b/src/account.h	Sun Aug 08 14:24:42 2004 +0000
@@ -35,9 +35,9 @@
 typedef gboolean (*GaimFilterAccountFunc)(GaimAccount *account);
 
 #include "connection.h"
+#include "log.h"
 #include "proxy.h"
 #include "prpl.h"
-#include "log.h"
 
 struct _GaimAccountUiOps
 {
diff -r f105bc0270c7 -r 78022bad9367 src/buddyicon.h
--- a/src/buddyicon.h	Sun Aug 08 14:21:30 2004 +0000
+++ b/src/buddyicon.h	Sun Aug 08 14:24:42 2004 +0000
@@ -28,6 +28,7 @@
 typedef struct _GaimBuddyIcon GaimBuddyIcon;
 
 #include "account.h"
+#include "blist.h"
 
 struct _GaimBuddyIcon
 {
diff -r f105bc0270c7 -r 78022bad9367 src/conversation.h
--- a/src/conversation.h	Sun Aug 08 14:21:30 2004 +0000
+++ b/src/conversation.h	Sun Aug 08 14:24:42 2004 +0000
@@ -133,8 +133,8 @@
 } GaimConvChatBuddyFlags;
 
 #include "account.h"
+#include "buddyicon.h"
 #include "log.h"
-#include "buddyicon.h"
 #include "server.h"
 
 /**
diff -r f105bc0270c7 -r 78022bad9367 src/gtkconv.h
--- a/src/gtkconv.h	Sun Aug 08 14:21:30 2004 +0000
+++ b/src/gtkconv.h	Sun Aug 08 14:24:42 2004 +0000
@@ -25,9 +25,9 @@
 #ifndef _GAIM_GTKCONVERSATION_H_
 #define _GAIM_GTKCONVERSATION_H_
 
-#include "conversation.h"
+#include "gtkinternal.h"
 
-#include "gtkinternal.h"
+#include "conversation.h"
 
 enum {
 	CHAT_USERS_ICON_COLUMN,
diff -r f105bc0270c7 -r 78022bad9367 src/gtkdialogs.h
--- a/src/gtkdialogs.h	Sun Aug 08 14:21:30 2004 +0000
+++ b/src/gtkdialogs.h	Sun Aug 08 14:24:42 2004 +0000
@@ -25,11 +25,11 @@
 #ifndef _GAIM_GTKDIALOGS_H_
 #define _GAIM_GTKDIALOGS_H_
 
+#include "gtkinternal.h"
+
 #include "account.h"
 #include "conversation.h"
 
-#include "gtkinternal.h"
-
 /* Functions in gtkdialogs.c (these should actually stay in this file) */
 void gaim_gtkdialogs_im();
 void gaim_gtkdialogs_info();
diff -r f105bc0270c7 -r 78022bad9367 src/server.h
--- a/src/server.h	Sun Aug 08 14:21:30 2004 +0000
+++ b/src/server.h	Sun Aug 08 14:24:42 2004 +0000
@@ -33,6 +33,7 @@
 
 #include "account.h"
 #include "conversation.h"
+#include "prpl.h"
 
 #ifdef __cplusplus
 extern "C" {