diff options
Diffstat (limited to 'libpurple/protocols/msn/switchboard.h')
| -rw-r--r-- | libpurple/protocols/msn/switchboard.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/libpurple/protocols/msn/switchboard.h b/libpurple/protocols/msn/switchboard.h index 891d31902d..1a6c958914 100644 --- a/libpurple/protocols/msn/switchboard.h +++ b/libpurple/protocols/msn/switchboard.h @@ -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 @@ typedef enum 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,9 +48,15 @@ typedef enum { 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; +#include "conversation.h" + +#include "msg.h" +#include "servconn.h" +#include "slplink.h" +#include "user.h" + /** * A switchboard. * @@ -290,4 +286,4 @@ void msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg); void msn_switchboard_show_ink(MsnSwitchBoard *swboard, const char *passport, const char *data); -#endif /* _MSN_SWITCHBOARD_H_ */ +#endif /* MSN_SWITCHBOARD_H */ |