Mercurial > pidgin
diff libpurple/protocols/msn/switchboard.h @ 28983:462cb893521b
Minor header file cleanup. Mostly I wanted to move some enums above some #includes
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Fri, 05 Feb 2010 22:49:11 +0000 |
parents | a6d84d9de605 |
children | 396084caaf12 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/switchboard.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/switchboard.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,20 +21,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _MSN_SWITCHBOARD_H_ -#define _MSN_SWITCHBOARD_H_ +#ifndef MSN_SWITCHBOARD_H +#define MSN_SWITCHBOARD_H typedef struct _MsnSwitchBoard MsnSwitchBoard; -#include "conversation.h" - -#include "msg.h" -#include "user.h" - -#include "servconn.h" - -#include "slplink.h" - /** * A switchboard error. */ @@ -48,7 +39,6 @@ MSN_SB_ERROR_TOO_FAST, /**< We are sending too fast */ MSN_SB_ERROR_AUTHFAILED, /**< Authentication failed joining the switchboard session */ MSN_SB_ERROR_UNKNOWN /**< An unknown error occurred. */ - } MsnSBErrorType; /** @@ -58,8 +48,14 @@ { MSN_SB_FLAG_IM = 0x01, /**< This switchboard is being used for a conversation. */ MSN_SB_FLAG_FT = 0x02 /**< This switchboard is being used for file transfer. */ +} MsnSBFlag; -} MsnSBFlag; +#include "conversation.h" + +#include "msg.h" +#include "servconn.h" +#include "slplink.h" +#include "user.h" /** * A switchboard. @@ -290,4 +286,4 @@ void msn_switchboard_show_ink(MsnSwitchBoard *swboard, const char *passport, const char *data); -#endif /* _MSN_SWITCHBOARD_H_ */ +#endif /* MSN_SWITCHBOARD_H */