Mercurial > pidgin.yaz
changeset 29373:462cb893521b
Minor header file cleanup. Mostly I wanted to move some enums above some #includes
line wrap: on
line diff
--- a/libpurple/protocols/msn/cmdproc.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/cmdproc.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,17 +21,17 @@ * 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_CMDPROC_H_ -#define _MSN_CMDPROC_H_ +#ifndef MSN_CMDPROC_H +#define MSN_CMDPROC_H typedef struct _MsnCmdProc MsnCmdProc; -#include "session.h" -#include "servconn.h" +#include "command.h" #include "error.h" -#include "command.h" +#include "history.h" +#include "servconn.h" +#include "session.h" #include "table.h" -#include "history.h" struct _MsnCmdProc { @@ -71,4 +71,4 @@ void msn_cmdproc_process_payload(MsnCmdProc *cmdproc, char *payload, int payload_len); -#endif /* _MSN_CMDPROC_H_ */ +#endif /* MSN_CMDPROC_H */
--- a/libpurple/protocols/msn/command.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/command.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,8 +21,8 @@ * 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_COMMAND_H -#define _MSN_COMMAND_H +#ifndef MSN_COMMAND_H +#define MSN_COMMAND_H typedef struct _MsnCommand MsnCommand; @@ -59,4 +59,4 @@ MsnCommand *msn_command_ref(MsnCommand *cmd); MsnCommand *msn_command_unref(MsnCommand *cmd); -#endif /* _MSN_COMMAND_H */ +#endif /* MSN_COMMAND_H */
--- a/libpurple/protocols/msn/contact.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/contact.h Fri Feb 05 22:49:11 2010 +0000 @@ -22,8 +22,38 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _MSN_CONTACT_H_ -#define _MSN_CONTACT_H_ +#ifndef MSN_CONTACT_H +#define MSN_CONTACT_H + +typedef struct _MsnCallbackState MsnCallbackState; + +typedef enum +{ + MSN_ADD_BUDDY = 0x01, + MSN_MOVE_BUDDY = 0x02, + MSN_ACCEPTED_BUDDY = 0x04, + MSN_DENIED_BUDDY = 0x08, + MSN_ADD_GROUP = 0x10, + MSN_DEL_GROUP = 0x20, + MSN_RENAME_GROUP = 0x40, + MSN_UPDATE_INFO = 0x80 +} MsnCallbackAction; + +typedef enum +{ + MSN_UPDATE_DISPLAY, /* Real display name */ + MSN_UPDATE_ALIAS, /* Aliased display name */ + MSN_UPDATE_COMMENT +} MsnContactUpdateType; + +typedef enum +{ + MSN_PS_INITIAL, + MSN_PS_SAVE_CONTACT, + MSN_PS_PENDING_LIST, + MSN_PS_CONTACT_API, + MSN_PS_BLOCK_UNBLOCK +} MsnSoapPartnerScenario; #include "session.h" #include "soap.h" @@ -609,29 +639,6 @@ "</soap:Body>"\ "</soap:Envelope>" -typedef enum -{ - MSN_ADD_BUDDY = 0x01, - MSN_MOVE_BUDDY = 0x02, - MSN_ACCEPTED_BUDDY = 0x04, - MSN_DENIED_BUDDY = 0x08, - MSN_ADD_GROUP = 0x10, - MSN_DEL_GROUP = 0x20, - MSN_RENAME_GROUP = 0x40, - MSN_UPDATE_INFO = 0x80 -} MsnCallbackAction; - -typedef enum -{ - MSN_PS_INITIAL, - MSN_PS_SAVE_CONTACT, - MSN_PS_PENDING_LIST, - MSN_PS_CONTACT_API, - MSN_PS_BLOCK_UNBLOCK -} MsnSoapPartnerScenario; - -typedef struct _MsnCallbackState MsnCallbackState; - struct _MsnCallbackState { gchar * who; @@ -651,13 +658,6 @@ MsnSoapPartnerScenario partner_scenario; }; -typedef enum -{ - MSN_UPDATE_DISPLAY, /* Real display name */ - MSN_UPDATE_ALIAS, /* Aliased display name */ - MSN_UPDATE_COMMENT -} MsnContactUpdateType; - /************************************************ * function prototype ************************************************/ @@ -707,5 +707,4 @@ void msn_del_contact_from_list(MsnSession *session, MsnCallbackState *state, const gchar *passport, const MsnListId list); -#endif /* _MSN_CONTACT_H_ */ - +#endif /* MSN_CONTACT_H */
--- a/libpurple/protocols/msn/dialog.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/dialog.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,10 +21,10 @@ * 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_DIALOG_H_ -#define _MSN_DIALOG_H_ +#ifndef MSN_DIALOG_H +#define MSN_DIALOG_H void msn_show_sync_issue(MsnSession *session, const char *passport, const char *group_name); -#endif /* _MSN_DIALOG_H_ */ +#endif /* MSN_DIALOG_H */
--- a/libpurple/protocols/msn/directconn.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/directconn.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,14 +21,14 @@ * 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_DIRECTCONN_H_ -#define _MSN_DIRECTCONN_H_ +#ifndef MSN_DIRECTCONN_H +#define MSN_DIRECTCONN_H typedef struct _MsnDirectConn MsnDirectConn; -#include "slplink.h" +#include "msg.h" #include "slp.h" -#include "msg.h" +#include "slplink.h" struct _MsnDirectConn { @@ -58,4 +58,4 @@ void msn_directconn_destroy(MsnDirectConn *directconn); void msn_directconn_send_handshake(MsnDirectConn *directconn); -#endif /* _MSN_DIRECTCONN_H_ */ +#endif /* MSN_DIRECTCONN_H */
--- a/libpurple/protocols/msn/error.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/error.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,8 +21,8 @@ * 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_ERROR_H_ -#define _MSN_ERROR_H_ +#ifndef MSN_ERROR_H +#define MSN_ERROR_H #include "session.h" @@ -44,4 +44,4 @@ */ void msn_error_handle(MsnSession *session, unsigned int type); -#endif /* _MSN_ERROR_H_ */ +#endif /* MSN_ERROR_H */
--- a/libpurple/protocols/msn/group.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/group.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,8 +21,8 @@ * 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_GROUP_H_ -#define _MSN_GROUP_H_ +#ifndef MSN_GROUP_H +#define MSN_GROUP_H typedef struct _MsnGroup MsnGroup; @@ -106,5 +106,4 @@ */ const char *msn_group_get_name(const MsnGroup *group); -#endif /* _MSN_GROUP_H_ */ - +#endif /* MSN_GROUP_H */
--- a/libpurple/protocols/msn/history.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/history.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,16 +21,16 @@ * 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_HISTORY_H -#define _MSN_HISTORY_H - -#define MSN_NS_HIST_ELEMS 0x300 -#define MSN_SB_HIST_ELEMS 0x30 +#ifndef MSN_HISTORY_H +#define MSN_HISTORY_H typedef struct _MsnHistory MsnHistory; #include "transaction.h" +#define MSN_NS_HIST_ELEMS 0x300 +#define MSN_SB_HIST_ELEMS 0x30 + /** * The history. */ @@ -45,4 +45,4 @@ MsnTransaction *msn_history_find(MsnHistory *history, unsigned int triId); void msn_history_add(MsnHistory *history, MsnTransaction *trans); -#endif /* _MSN_HISTORY_H */ +#endif /* MSN_HISTORY_H */
--- a/libpurple/protocols/msn/httpconn.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/httpconn.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,8 +21,8 @@ * 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_HTTPCONN_H_ -#define _MSN_HTTPCONN_H_ +#ifndef MSN_HTTPCONN_H +#define MSN_HTTPCONN_H typedef struct _MsnHttpConn MsnHttpConn; @@ -108,4 +108,4 @@ */ void msn_httpconn_disconnect(MsnHttpConn *httpconn); -#endif /* _MSN_HTTPCONN_H_ */ +#endif /* MSN_HTTPCONN_H */
--- a/libpurple/protocols/msn/msg.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/msg.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,32 +21,17 @@ * 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_MSG_H_ -#define _MSN_MSG_H_ +#ifndef MSN_MSG_H +#define MSN_MSG_H typedef struct _MsnMessage MsnMessage; -#include "session.h" -#include "user.h" - -#include "command.h" -#include "transaction.h" - -typedef void (*MsnMsgCb)(MsnMessage *, void *data); - -#define MSG_BODY_DEM "\r\n\r\n" -#define MSG_LINE_DEM "\r\n" - -#define MSG_OIM_BODY_DEM "\n\n" -#define MSG_OIM_LINE_DEM "\n" - /* typedef enum { MSN_MSG_NORMAL, MSN_MSG_SLP_SB, MSN_MSG_SLP_DC - } MsnMsgType; */ @@ -58,7 +43,6 @@ MSN_MSG_CAPS, MSN_MSG_SLP, MSN_MSG_NUDGE - } MsnMsgType; typedef enum @@ -68,8 +52,20 @@ MSN_MSG_ERROR_NAK, /**< The message could not be sent. */ MSN_MSG_ERROR_SB, /**< The error comes from the switchboard. */ MSN_MSG_ERROR_UNKNOWN /**< An unknown error occurred. */ +} MsnMsgErrorType; -} MsnMsgErrorType; +#include "command.h" +#include "session.h" +#include "transaction.h" +#include "user.h" + +typedef void (*MsnMsgCb)(MsnMessage *, void *data); + +#define MSG_BODY_DEM "\r\n\r\n" +#define MSG_LINE_DEM "\r\n" + +#define MSG_OIM_BODY_DEM "\n\n" +#define MSG_OIM_LINE_DEM "\n" typedef struct { @@ -82,13 +78,11 @@ guint32 ack_id; guint32 ack_sub_id; guint64 ack_size; - } MsnSlpHeader; typedef struct { guint32 value; - } MsnSlpFooter; /** @@ -347,4 +341,4 @@ void msn_handwritten_msg(MsnCmdProc *cmdproc, MsnMessage *msg); -#endif /* _MSN_MSG_H_ */ +#endif /* MSN_MSG_H */
--- a/libpurple/protocols/msn/msn.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/msn.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,8 +21,65 @@ * 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_H_ -#define _MSN_H_ +#ifndef MSN_H +#define MSN_H + +typedef enum +{ + MSN_LIST_FL_OP = 0x01, + MSN_LIST_AL_OP = 0x02, + MSN_LIST_BL_OP = 0x04, + MSN_LIST_RL_OP = 0x08, + MSN_LIST_PL_OP = 0x10 +} MsnListOp; +#define MSN_LIST_OP_MASK 0x07 + +typedef enum +{ + MSN_CLIENT_CAP_WIN_MOBILE = 0x0000001, + MSN_CLIENT_CAP_INK_GIF = 0x0000004, + MSN_CLIENT_CAP_INK_ISF = 0x0000008, + MSN_CLIENT_CAP_VIDEO_CHAT = 0x0000010, + MSN_CLIENT_CAP_PACKET = 0x0000020, + MSN_CLIENT_CAP_MSNMOBILE = 0x0000040, + MSN_CLIENT_CAP_MSNDIRECT = 0x0000080, + MSN_CLIENT_CAP_WEBMSGR = 0x0000200, + MSN_CLIENT_CAP_TGW = 0x0000800, + MSN_CLIENT_CAP_SPACE = 0x0001000, + MSN_CLIENT_CAP_MCE = 0x0002000, + MSN_CLIENT_CAP_DIRECTIM = 0x0004000, + MSN_CLIENT_CAP_WINKS = 0x0008000, + MSN_CLIENT_CAP_SEARCH = 0x0010000, + MSN_CLIENT_CAP_BOT = 0x0020000, + MSN_CLIENT_CAP_VOICEIM = 0x0040000, + MSN_CLIENT_CAP_SCHANNEL = 0x0080000, + MSN_CLIENT_CAP_SIP_INVITE = 0x0100000, + MSN_CLIENT_CAP_SDRIVE = 0x0400000, + MSN_CLIENT_CAP_ONECARE = 0x1000000, + MSN_CLIENT_CAP_P2P_TURN = 0x2000000, + MSN_CLIENT_CAP_P2P_BOOTSTRAP_VIA_UUN = 0x4000000, +} MsnClientCaps; + +typedef enum +{ + MSN_CLIENT_EXT_CAP_RTC_VIDEO = 0x10, + MSN_CLIENT_EXT_CAP_P2PV2 = 0x20 +} MsnClientExtCaps; + +typedef enum +{ + MSN_CLIENT_VER_5_0 = 0x00, + MSN_CLIENT_VER_6_0 = 0x10, /* MSNC1 */ + MSN_CLIENT_VER_6_1 = 0x20, /* MSNC2 */ + MSN_CLIENT_VER_6_2 = 0x30, /* MSNC3 */ + MSN_CLIENT_VER_7_0 = 0x40, /* MSNC4 */ + MSN_CLIENT_VER_7_5 = 0x50, /* MSNC5 */ + MSN_CLIENT_VER_8_0 = 0x60, /* MSNC6 */ + MSN_CLIENT_VER_8_1 = 0x70, /* MSNC7 */ + MSN_CLIENT_VER_8_5 = 0x80, /* MSNC8 */ + MSN_CLIENT_VER_9_0 = 0x90, /* MSNC9 */ + MSN_CLIENT_VER_14_0 = 0xA0 /* MSNC10 */ +} MsnClientVerId; #include "internal.h" @@ -77,66 +134,6 @@ /* Index into attention_types */ #define MSN_NUDGE 0 -typedef enum -{ - MSN_LIST_FL_OP = 0x01, - MSN_LIST_AL_OP = 0x02, - MSN_LIST_BL_OP = 0x04, - MSN_LIST_RL_OP = 0x08, - MSN_LIST_PL_OP = 0x10 - -} MsnListOp; -#define MSN_LIST_OP_MASK 0x07 - -typedef enum -{ - MSN_CLIENT_CAP_WIN_MOBILE = 0x0000001, - MSN_CLIENT_CAP_INK_GIF = 0x0000004, - MSN_CLIENT_CAP_INK_ISF = 0x0000008, - MSN_CLIENT_CAP_VIDEO_CHAT = 0x0000010, - MSN_CLIENT_CAP_PACKET = 0x0000020, - MSN_CLIENT_CAP_MSNMOBILE = 0x0000040, - MSN_CLIENT_CAP_MSNDIRECT = 0x0000080, - MSN_CLIENT_CAP_WEBMSGR = 0x0000200, - MSN_CLIENT_CAP_TGW = 0x0000800, - MSN_CLIENT_CAP_SPACE = 0x0001000, - MSN_CLIENT_CAP_MCE = 0x0002000, - MSN_CLIENT_CAP_DIRECTIM = 0x0004000, - MSN_CLIENT_CAP_WINKS = 0x0008000, - MSN_CLIENT_CAP_SEARCH = 0x0010000, - MSN_CLIENT_CAP_BOT = 0x0020000, - MSN_CLIENT_CAP_VOICEIM = 0x0040000, - MSN_CLIENT_CAP_SCHANNEL = 0x0080000, - MSN_CLIENT_CAP_SIP_INVITE = 0x0100000, - MSN_CLIENT_CAP_SDRIVE = 0x0400000, - MSN_CLIENT_CAP_ONECARE = 0x1000000, - MSN_CLIENT_CAP_P2P_TURN = 0x2000000, - MSN_CLIENT_CAP_P2P_BOOTSTRAP_VIA_UUN = 0x4000000, - -} MsnClientCaps; - -typedef enum -{ - MSN_CLIENT_EXT_CAP_RTC_VIDEO = 0x10, - MSN_CLIENT_EXT_CAP_P2PV2 = 0x20 -} MsnClientExtCaps; - -typedef enum -{ - MSN_CLIENT_VER_5_0 = 0x00, - MSN_CLIENT_VER_6_0 = 0x10, /* MSNC1 */ - MSN_CLIENT_VER_6_1 = 0x20, /* MSNC2 */ - MSN_CLIENT_VER_6_2 = 0x30, /* MSNC3 */ - MSN_CLIENT_VER_7_0 = 0x40, /* MSNC4 */ - MSN_CLIENT_VER_7_5 = 0x50, /* MSNC5 */ - MSN_CLIENT_VER_8_0 = 0x60, /* MSNC6 */ - MSN_CLIENT_VER_8_1 = 0x70, /* MSNC7 */ - MSN_CLIENT_VER_8_5 = 0x80, /* MSNC8 */ - MSN_CLIENT_VER_9_0 = 0x90, /* MSNC9 */ - MSN_CLIENT_VER_14_0 = 0xA0 /* MSNC10 */ - -} MsnClientVerId; - #define MSN_CLIENT_ID_VERSION MSN_CLIENT_VER_7_0 #define MSN_CLIENT_ID_CAPABILITIES (MSN_CLIENT_CAP_PACKET|MSN_CLIENT_CAP_INK_GIF|MSN_CLIENT_CAP_VOICEIM) @@ -151,4 +148,4 @@ void msn_send_privacy(PurpleConnection *gc); void msn_send_im_message(MsnSession *session, MsnMessage *msg); -#endif /* _MSN_H_ */ +#endif /* MSN_H */
--- a/libpurple/protocols/msn/msnutils.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/msnutils.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,16 +21,16 @@ * 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_UTILS_H_ -#define _MSN_UTILS_H_ +#ifndef MSN_UTILS_H +#define MSN_UTILS_H /*encode the str to RFC2047 style*/ -char * msn_encode_mime(const char *str); +char *msn_encode_mime(const char *str); /** * Generate the Random GUID */ -char * rand_guid(void); +char *rand_guid(void); /** * Parses the MSN message formatting into a format compatible with Purple. @@ -57,4 +57,4 @@ void msn_parse_socket(const char *str, char **ret_host, int *ret_port); void msn_handle_chl(char *input, char *output); -#endif /* _MSN_UTILS_H_ */ +#endif /* MSN_UTILS_H */
--- a/libpurple/protocols/msn/nexus.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/nexus.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,8 +21,12 @@ * 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_NEXUS_H_ -#define _MSN_NEXUS_H_ +#ifndef MSN_NEXUS_H +#define MSN_NEXUS_H + +typedef struct _MsnNexus MsnNexus; +typedef struct _MsnTicketToken MsnTicketToken; +typedef struct _MsnUsrKey MsnUsrKey; /* Index into ticket_tokens in nexus.c Keep updated! */ typedef enum @@ -183,7 +187,6 @@ "</Body>"\ "</Envelope>" -typedef struct _MsnUsrKey MsnUsrKey; struct _MsnUsrKey { int size; /* 28. Does not count data */ @@ -199,7 +202,6 @@ char cipher[72]; }; -typedef struct _MsnTicketToken MsnTicketToken; struct _MsnTicketToken { GHashTable *token; char *secret; @@ -207,8 +209,6 @@ GSList *updates; }; -typedef struct _MsnNexus MsnNexus; - struct _MsnNexus { MsnSession *session; @@ -230,5 +230,5 @@ GHashTable *msn_nexus_get_token(MsnNexus *nexus, MsnAuthDomains id); const char *msn_nexus_get_token_str(MsnNexus *nexus, MsnAuthDomains id); void msn_nexus_update_token(MsnNexus *nexus, int id, GSourceFunc cb, gpointer data); -#endif /* _MSN_NEXUS_H_ */ +#endif /* MSN_NEXUS_H */
--- a/libpurple/protocols/msn/notification.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/notification.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,27 +21,29 @@ * 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_NOTIFICATION_H_ -#define _MSN_NOTIFICATION_H_ +#ifndef MSN_NOTIFICATION_H +#define MSN_NOTIFICATION_H -/*MSN protocol challenge info*/ +typedef struct _MsnNotification MsnNotification; -/*MSNP15 challenge: WLM 8.5.1288.816*/ +/* MSN protocol challenge info */ + +/* MSNP15 challenge: WLM 8.5.1288.816 */ #define MSNP15_WLM_PRODUCT_KEY "ILTXC!4IXB5FB*PX" #define MSNP15_WLM_PRODUCT_ID "PROD0119GSJUC$18" -/*MSNP13 challenge*/ +/* MSNP13 challenge */ #define MSNP13_WLM_PRODUCT_KEY "O4BG@C7BWLYQX?5G" #define MSNP13_WLM_PRODUCT_ID "PROD01065C%ZFN6F" #define MSNP10_PRODUCT_KEY "VT6PX?UQTM4WM%YR" #define MSNP10_PRODUCT_ID "PROD0038W!61ZTF9" -typedef struct _MsnNotification MsnNotification; - +#include "cmdproc.h" +#include "msg.h" #include "session.h" #include "servconn.h" -#include "cmdproc.h" +#include "state.h" #include "user.h" struct _MsnNotification @@ -60,8 +62,7 @@ typedef void (*MsnFqyCb)(MsnSession *session, const char *passport, MsnNetwork network, gpointer data); -#include "state.h" -void uum_send_msg(MsnSession *session,MsnMessage *msg); +void uum_send_msg(MsnSession *session, MsnMessage *msg); void msn_notification_end(void); void msn_notification_init(void); @@ -93,4 +94,4 @@ void msn_got_login_params(MsnSession *session, const char *ticket, const char *response); -#endif /* _MSN_NOTIFICATION_H_ */ +#endif /* MSN_NOTIFICATION_H */
--- a/libpurple/protocols/msn/object.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/object.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,12 +21,8 @@ * 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_OBJECT_H_ -#define _MSN_OBJECT_H_ - -#include "imgstore.h" - -#include "internal.h" +#ifndef MSN_OBJECT_H +#define MSN_OBJECT_H typedef enum { @@ -36,8 +32,11 @@ MSN_OBJECT_USERTILE = 3, /**< UserTile (buddy icon) */ MSN_OBJECT_RESERVED2 = 4, /**< Reserved */ MSN_OBJECT_BACKGROUND = 5 /**< Background */ +} MsnObjectType; -} MsnObjectType; +#include "internal.h" + +#include "imgstore.h" typedef struct { @@ -51,7 +50,6 @@ char *friendly; char *sha1d; char *sha1c; - } MsnObject; /** @@ -239,4 +237,4 @@ void msn_object_set_local(MsnObject *obj); -#endif /* _MSN_OBJECT_H_ */ +#endif /* MSN_OBJECT_H */
--- a/libpurple/protocols/msn/oim.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/oim.h Fri Feb 05 22:49:11 2010 +0000 @@ -22,8 +22,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _MSN_OIM_H_ -#define _MSN_OIM_H_ +#ifndef MSN_OIM_H +#define MSN_OIM_H + +typedef struct _MsnOim MsnOim; /* OIM Retrieval Info */ #define MSN_OIM_RETRIEVE_HOST "rsi.hotmail.com" @@ -131,8 +133,6 @@ "</soap:Body>"\ "</soap:Envelope>" -typedef struct _MsnOim MsnOim; - struct _MsnOim { MsnSession *session; @@ -160,4 +160,4 @@ void msn_oim_send_msg(MsnOim *oim); -#endif/* _MSN_OIM_H_*/ +#endif/* MSN_OIM_H*/
--- a/libpurple/protocols/msn/page.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/page.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,8 +21,8 @@ * 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_PAGE_H_ -#define _MSN_PAGE_H_ +#ifndef MSN_PAGE_H +#define MSN_PAGE_H typedef struct _MsnPage MsnPage; @@ -78,4 +78,4 @@ */ const char *msn_page_get_body(const MsnPage *page); -#endif /* _MSN_PAGE_H_ */ +#endif /* MSN_PAGE_H */
--- a/libpurple/protocols/msn/servconn.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/servconn.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,17 +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_SERVCONN_H_ -#define _MSN_SERVCONN_H_ +#ifndef MSN_SERVCONN_H +#define MSN_SERVCONN_H typedef struct _MsnServConn MsnServConn; -#include "session.h" -#include "cmdproc.h" - -#include "proxy.h" -#include "httpconn.h" - /** * Connection error types. */ @@ -41,7 +35,6 @@ MSN_SERVCONN_ERROR_CONNECT, MSN_SERVCONN_ERROR_WRITE, MSN_SERVCONN_ERROR_READ - } MsnServConnError; /** @@ -51,8 +44,13 @@ { MSN_SERVCONN_NS, MSN_SERVCONN_SB +} MsnServConnType; -} MsnServConnType; +#include "proxy.h" + +#include "cmdproc.h" +#include "httpconn.h" +#include "session.h" /** * A Connection. @@ -191,4 +189,4 @@ */ void msn_servconn_set_idle_timeout(MsnServConn *servconn, guint seconds); -#endif /* _MSN_SERVCONN_H_ */ +#endif /* MSN_SERVCONN_H */
--- a/libpurple/protocols/msn/session.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/session.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,27 +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_SESSION_H_ -#define _MSN_SESSION_H_ +#ifndef MSN_SESSION_H +#define MSN_SESSION_H typedef struct _MsnSession MsnSession; -#include "sslconn.h" - -#include "user.h" -#include "slpcall.h" - -#include "notification.h" -#include "switchboard.h" -#include "group.h" - -#include "nexus.h" -#include "httpconn.h" -#include "oim.h" - -#include "userlist.h" -#include "sync.h" - /** * Types of errors. */ @@ -55,7 +39,6 @@ MSN_ERROR_SIGN_OTHER, MSN_ERROR_SERV_DOWN, MSN_ERROR_SERV_UNAVAILABLE - } MsnErrorType; /** @@ -73,11 +56,22 @@ MSN_LOGIN_STEP_AUTH_END, MSN_LOGIN_STEP_SYN, MSN_LOGIN_STEP_END - } MsnLoginStep; #define MSN_LOGIN_STEPS MSN_LOGIN_STEP_END +#include "group.h" +#include "httpconn.h" +#include "nexus.h" +#include "notification.h" +#include "oim.h" +#include "slpcall.h" +#include "sslconn.h" +#include "switchboard.h" +#include "sync.h" +#include "user.h" +#include "userlist.h" + struct _MsnSession { PurpleAccount *account; @@ -238,4 +232,4 @@ void msn_session_report_user(MsnSession *session,const char *passport, const char *msg,PurpleMessageFlags flags); -#endif /* _MSN_SESSION_H_ */ +#endif /* MSN_SESSION_H */
--- a/libpurple/protocols/msn/slp.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/slp.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,13 +21,14 @@ * 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_SLP_H_ -#define _MSN_SLP_H_ +#ifndef MSN_SLP_H +#define MSN_SLP_H +#include "internal.h" + +#include "ft.h" +#include "session.h" #include "slpcall.h" -#include "session.h" -#include "internal.h" -#include "ft.h" MsnSlpCall * msn_slp_sip_recv(MsnSlpLink *slplink, const char *body); @@ -45,4 +46,4 @@ void msn_queue_buddy_icon_request(MsnUser *user); -#endif /* _MSN_SLP_H_ */ +#endif /* MSN_SLP_H */
--- a/libpurple/protocols/msn/slpcall.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/slpcall.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,26 +21,26 @@ * 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_SLPCALL_H_ -#define _MSN_SLPCALL_H_ +#ifndef MSN_SLPCALL_H +#define MSN_SLPCALL_H + +typedef struct _MsnSlpCall MsnSlpCall; + +typedef enum +{ + MSN_SLPCALL_ANY, + MSN_SLPCALL_DC +} MsnSlpCallType; #include "internal.h" + #include "ft.h" -typedef struct _MsnSlpCall MsnSlpCall; - #include "slplink.h" /* The official client seems to timeout slp calls after 5 minutes */ #define MSN_SLPCALL_TIMEOUT 300 -typedef enum -{ - MSN_SLPCALL_ANY, - MSN_SLPCALL_DC - -} MsnSlpCallType; - struct _MsnSlpCall { /* Our parent slplink */ @@ -95,4 +95,4 @@ int app_id, const char *context); void msn_slpcall_close(MsnSlpCall *slpcall); -#endif /* _MSN_SLPCALL_H_ */ +#endif /* MSN_SLPCALL_H */
--- a/libpurple/protocols/msn/slplink.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/slplink.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,21 +21,19 @@ * 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_SLPLINK_H_ -#define _MSN_SLPLINK_H_ +#ifndef MSN_SLPLINK_H +#define MSN_SLPLINK_H typedef struct _MsnSlpLink MsnSlpLink; +#include "ft.h" + #include "directconn.h" +#include "session.h" #include "slpcall.h" #include "slpmsg.h" - #include "switchboard.h" -#include "ft.h" - -#include "session.h" - typedef void (*MsnSlpCb)(MsnSlpCall *slpcall, const guchar *data, gsize size); typedef void (*MsnSlpEndCb)(MsnSlpCall *slpcall, MsnSession *session); @@ -95,4 +93,4 @@ MsnSlpCall *msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg); -#endif /* _MSN_SLPLINK_H_ */ +#endif /* MSN_SLPLINK_H */
--- a/libpurple/protocols/msn/soap.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/soap.h Fri Feb 05 22:49:11 2010 +0000 @@ -22,17 +22,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef MSN_SOAP_H +#define MSN_SOAP_H -#ifndef _MSN_SOAP_H -#define _MSN_SOAP_H +typedef struct _MsnSoapMessage MsnSoapMessage; + +#include <glib.h> + +#include "xmlnode.h" #include "session.h" #include "sslconn.h" -#include "xmlnode.h" -#include <glib.h> - -typedef struct _MsnSoapMessage MsnSoapMessage; typedef void (*MsnSoapCallback)(MsnSoapMessage *request, MsnSoapMessage *response, gpointer cb_data); @@ -48,4 +49,4 @@ const char *host, const char *path, gboolean secure, MsnSoapCallback cb, gpointer cb_data); -#endif +#endif /* MSN_SOAP_H */
--- a/libpurple/protocols/msn/state.c Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/state.c Fri Feb 05 22:49:11 2010 +0000 @@ -23,6 +23,7 @@ */ #include "internal.h" + #include "core.h" #include "msn.h"
--- a/libpurple/protocols/msn/state.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/state.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,8 +21,8 @@ * 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_STATE_H_ -#define _MSN_STATE_H_ +#ifndef MSN_STATE_H +#define MSN_STATE_H /** * Away types. @@ -38,7 +38,6 @@ MSN_LUNCH = 7, MSN_OFFLINE = 8, MSN_HIDDEN = 9 - } MsnAwayType; /** @@ -62,11 +61,11 @@ void msn_set_psm(MsnSession *session); /* Get the CurrentMedia info from the XML string */ -char * msn_get_currentmedia(char *xml_str,gsize len); +char *msn_get_currentmedia(char *xml_str, gsize len); /*get the PSM info from the XML string*/ -char * msn_get_psm(char *xml_str,gsize len); +char *msn_get_psm(char *xml_str, gsize len); MsnAwayType msn_state_from_account(PurpleAccount *account); -#endif /* _MSN_STATE_H_ */ +#endif /* MSN_STATE_H */
--- 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 */
--- a/libpurple/protocols/msn/sync.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/sync.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,8 +21,8 @@ * 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_SYNC_H_ -#define _MSN_SYNC_H_ +#ifndef MSN_SYNC_H +#define MSN_SYNC_H typedef struct _MsnSync MsnSync; @@ -51,7 +51,7 @@ void msn_sync_init(void); void msn_sync_end(void); -MsnSync * msn_sync_new(MsnSession *session); +MsnSync *msn_sync_new(MsnSession *session); void msn_sync_destroy(MsnSync *sync); -#endif /* _MSN_SYNC_H_ */ +#endif /* MSN_SYNC_H */
--- a/libpurple/protocols/msn/table.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/table.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,8 +21,8 @@ * 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_TABLE_H_ -#define _MSN_TABLE_H_ +#ifndef MSN_TABLE_H +#define MSN_TABLE_H typedef struct _MsnTable MsnTable; @@ -50,4 +50,4 @@ void msn_table_add_error(MsnTable *table, char *answer, MsnErrorCb cb); void msn_table_add_msg_type(MsnTable *table, char *type, MsnMsgTypeCb cb); -#endif /* _MSN_TABLE_H_ */ +#endif /* MSN_TABLE_H */
--- a/libpurple/protocols/msn/transaction.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/transaction.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,13 +21,13 @@ * 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_TRANSACTION_H -#define _MSN_TRANSACTION_H +#ifndef MSN_TRANSACTION_H +#define MSN_TRANSACTION_H typedef struct _MsnTransaction MsnTransaction; +#include "cmdproc.h" #include "command.h" -#include "cmdproc.h" typedef void (*MsnTransCb)(MsnCmdProc *cmdproc, MsnCommand *cmd); typedef void (*MsnTimeoutCb)(MsnCmdProc *cmdproc, MsnTransaction *trans); @@ -79,4 +79,4 @@ void msn_transaction_set_error_cb(MsnTransaction *trans, MsnErrorCb cb); void msn_transaction_set_timeout_cb(MsnTransaction *trans, MsnTimeoutCb cb); -#endif /* _MSN_TRANSACTION_H */ +#endif /* MSN_TRANSACTION_H */
--- a/libpurple/protocols/msn/user.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/user.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,16 +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_USER_H_ -#define _MSN_USER_H_ +#ifndef MSN_USER_H +#define MSN_USER_H typedef struct _MsnUser MsnUser; -#include "session.h" -#include "object.h" - -#include "userlist.h" - typedef enum { MSN_NETWORK_UNKNOWN = 0x00, @@ -53,6 +48,10 @@ CURRENT_MEDIA_OFFICE } CurrentMediaType; +#include "object.h" +#include "session.h" +#include "userlist.h" + /** * Contains optional info about a user that is fairly uncommon. We * put this info in in a separate struct to save memory because we @@ -394,19 +393,16 @@ /** * check to see if user is online */ -gboolean -msn_user_is_online(PurpleAccount *account, const char *name); +gboolean msn_user_is_online(PurpleAccount *account, const char *name); /** * check to see if user is Yahoo User */ -gboolean -msn_user_is_yahoo(PurpleAccount *account ,const char *name); +gboolean msn_user_is_yahoo(PurpleAccount *account ,const char *name); void msn_user_set_op(MsnUser *user, int list_op); void msn_user_unset_op(MsnUser *user, int list_op); /*@}*/ - -#endif /* _MSN_USER_H_ */ +#endif /* MSN_USER_H */
--- a/libpurple/protocols/msn/userlist.h Fri Feb 05 14:40:39 2010 +0000 +++ b/libpurple/protocols/msn/userlist.h Fri Feb 05 22:49:11 2010 +0000 @@ -21,14 +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_USERLIST_H_ -#define _MSN_USERLIST_H_ +#ifndef MSN_USERLIST_H +#define MSN_USERLIST_H typedef struct _MsnUserList MsnUserList; -#include "user.h" -#include "group.h" - typedef enum { MSN_LIST_FL, /**< Forward list */ @@ -38,6 +35,8 @@ MSN_LIST_PL /**< Pending list */ } MsnListId; +#include "group.h" +#include "user.h" struct _MsnUserList { @@ -101,4 +100,4 @@ void msn_userlist_load(MsnSession *session); -#endif /* _MSN_USERLIST_H_ */ +#endif /* MSN_USERLIST_H */