Mercurial > pidgin.yaz
changeset 9718:78022bad9367
[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>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 08 Aug 2004 14:24:42 +0000 |
| parents | f105bc0270c7 |
| children | 9e41c6809f85 |
| files | src/account.h src/buddyicon.h src/conversation.h src/gtkconv.h src/gtkdialogs.h src/server.h |
| diffstat | 6 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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 {
--- 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 {
--- 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" /**
--- 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,
--- 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();