pidgin: be319950: Minor header file cleanup. Mostly I wan...
markdoliner at pidgin.im
markdoliner at pidgin.im
Fri Feb 5 17:50:44 EST 2010
-----------------------------------------------------------------
Revision: be31995039c1f8edae9ebedb54fc5fa3fa42e232
Ancestor: b0098e2250f135d121960d8152e144e7e344125e
Author: markdoliner at pidgin.im
Date: 2010-02-05T22:49:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/be31995039c1f8edae9ebedb54fc5fa3fa42e232
Modified files:
libpurple/protocols/msn/cmdproc.h
libpurple/protocols/msn/command.h
libpurple/protocols/msn/contact.h
libpurple/protocols/msn/dialog.h
libpurple/protocols/msn/directconn.h
libpurple/protocols/msn/error.h
libpurple/protocols/msn/group.h
libpurple/protocols/msn/history.h
libpurple/protocols/msn/httpconn.h
libpurple/protocols/msn/msg.h libpurple/protocols/msn/msn.h
libpurple/protocols/msn/msnutils.h
libpurple/protocols/msn/nexus.h
libpurple/protocols/msn/notification.h
libpurple/protocols/msn/object.h
libpurple/protocols/msn/oim.h libpurple/protocols/msn/page.h
libpurple/protocols/msn/servconn.h
libpurple/protocols/msn/session.h
libpurple/protocols/msn/slp.h
libpurple/protocols/msn/slpcall.h
libpurple/protocols/msn/slplink.h
libpurple/protocols/msn/soap.h
libpurple/protocols/msn/state.c
libpurple/protocols/msn/state.h
libpurple/protocols/msn/switchboard.h
libpurple/protocols/msn/sync.h
libpurple/protocols/msn/table.h
libpurple/protocols/msn/transaction.h
libpurple/protocols/msn/user.h
libpurple/protocols/msn/userlist.h
ChangeLog:
Minor header file cleanup. Mostly I wanted to move some enums above some #includes
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/cmdproc.h 8b244869b3bf1ca3bc6e9b8c28eeebf4cb95949c
+++ libpurple/protocols/msn/cmdproc.h 17067b2ccaa965b1c8eaa7fdf2a72c38339bfbc5
@@ -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(MsnCmdP
void msn_cmdproc_process_payload(MsnCmdProc *cmdproc,
char *payload, int payload_len);
-#endif /* _MSN_CMDPROC_H_ */
+#endif /* MSN_CMDPROC_H */
============================================================
--- libpurple/protocols/msn/command.h 3d1e3190fbcd9c861a284aff144b68e3832d7514
+++ libpurple/protocols/msn/command.h 86fb90888053ac5769526b1184943f81b5e62de5
@@ -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_unref(MsnCommand
MsnCommand *msn_command_ref(MsnCommand *cmd);
MsnCommand *msn_command_unref(MsnCommand *cmd);
-#endif /* _MSN_COMMAND_H */
+#endif /* MSN_COMMAND_H */
============================================================
--- libpurple/protocols/msn/contact.h 2c895fe6bbd5e8ade444244eb56fa07d71dea287
+++ libpurple/protocols/msn/contact.h 1ba18333d89f00e3aea1f44e4b404d3a3bcab2f4
@@ -22,9 +22,39 @@
* 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 @@ struct _MsnCallbackState
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(MsnSessio
void msn_del_contact_from_list(MsnSession *session, MsnCallbackState *state,
const gchar *passport, const MsnListId list);
-#endif /* _MSN_CONTACT_H_ */
-
+#endif /* MSN_CONTACT_H */
============================================================
--- libpurple/protocols/msn/dialog.h d768420a339adb93de770a9c8134b050bb85dc2d
+++ libpurple/protocols/msn/dialog.h 59a7b11ef895f12dfc4eccd05a50d960facc7de3
@@ -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 */
============================================================
--- libpurple/protocols/msn/directconn.h 3ab33824ba31ea3872d5a8f8ae515b5c7364fece
+++ libpurple/protocols/msn/directconn.h ef7f82578f19c35b65685ac763f5f0dcfbc3dca5
@@ -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_send_handshake(MsnDi
void msn_directconn_destroy(MsnDirectConn *directconn);
void msn_directconn_send_handshake(MsnDirectConn *directconn);
-#endif /* _MSN_DIRECTCONN_H_ */
+#endif /* MSN_DIRECTCONN_H */
============================================================
--- libpurple/protocols/msn/error.h a09c412ec93117866704692259b993e6d2499fb9
+++ libpurple/protocols/msn/error.h f69edfaaafbb3f6a22707fa670267d42ab6881cc
@@ -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 *sessio
*/
void msn_error_handle(MsnSession *session, unsigned int type);
-#endif /* _MSN_ERROR_H_ */
+#endif /* MSN_ERROR_H */
============================================================
--- libpurple/protocols/msn/group.h ac4652169560703f1ca79326e4b63e57d3325347
+++ libpurple/protocols/msn/group.h 2af181ad50e2ac53dcf1325403083bc1f1262052
@@ -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 Msn
*/
const char *msn_group_get_name(const MsnGroup *group);
-#endif /* _MSN_GROUP_H_ */
-
+#endif /* MSN_GROUP_H */
============================================================
--- libpurple/protocols/msn/history.h c68127fdb7b65bc8a43265e1843e9fc4814d07ae
+++ libpurple/protocols/msn/history.h fa41c583634d8ba4742f285c00ed9e1736ca7e92
@@ -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
+#ifndef MSN_HISTORY_H
+#define MSN_HISTORY_H
-#define MSN_NS_HIST_ELEMS 0x300
-#define MSN_SB_HIST_ELEMS 0x30
-
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 @@ void msn_history_add(MsnHistory *history
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 */
============================================================
--- libpurple/protocols/msn/httpconn.h 0889574fb91f0e9c08f0def30b080f15f6dca67f
+++ libpurple/protocols/msn/httpconn.h 8f00e728964381df18753816ef209fd0b89509ae
@@ -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
*/
void msn_httpconn_disconnect(MsnHttpConn *httpconn);
-#endif /* _MSN_HTTPCONN_H_ */
+#endif /* MSN_HTTPCONN_H */
============================================================
--- libpurple/protocols/msn/msg.h 747294e6f8f742838a7961e78f98290ba598e694
+++ libpurple/protocols/msn/msg.h 463e47046c1a8ee0ed241036878dd579886c66ba
@@ -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 @@ typedef enum
MSN_MSG_CAPS,
MSN_MSG_SLP,
MSN_MSG_NUDGE
-
} MsnMsgType;
typedef enum
@@ -68,9 +52,21 @@ typedef enum
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
{
guint32 session_id;
@@ -82,13 +78,11 @@ typedef struct
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 *cmd
void msn_handwritten_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
-#endif /* _MSN_MSG_H_ */
+#endif /* MSN_MSG_H */
============================================================
--- libpurple/protocols/msn/msn.h 7492677549e330de5d58d9dd313767941519f2ce
+++ libpurple/protocols/msn/msn.h 34d5f36337b69f918c1432c5bacb9d383d3a2c92
@@ -21,62 +21,9 @@
* 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
-#include "internal.h"
-
-#include "account.h"
-#include "accountopt.h"
-#include "blist.h"
-#include "connection.h"
-#include "conversation.h"
-#include "debug.h"
-#include "cipher.h"
-#include "notify.h"
-#include "privacy.h"
-#include "proxy.h"
-#include "prpl.h"
-#include "request.h"
-#include "servconn.h"
-#include "sslconn.h"
-#include "util.h"
-
-#include "ft.h"
-
-#include "msg.h"
-
-#define MSN_BUF_LEN 8192
-
-/* Windows Live Messenger Server*/
-#define MSN_SERVER "messenger.hotmail.com"
-#define MSN_HTTPCONN_SERVER "gateway.messenger.hotmail.com"
-#define MSN_PORT 1863
-#define WLM_PROT_VER 15
-
-#define WLM_MAX_PROTOCOL 15
-#define WLM_MIN_PROTOCOL 15
-
-#define MSN_TYPING_RECV_TIMEOUT 6
-#define MSN_TYPING_SEND_TIMEOUT 4
-
-#define PROFILE_URL "http://spaces.live.com/profile.aspx?mem="
-#define PHOTO_URL " contactparams:photopreauthurl=\""
-
-#define BUDDY_ALIAS_MAXLEN 387
-
-#define MSN_CAM_GUID "4BD96FC0-AB17-4425-A14A-439185962DC8"
-#define MSN_CAM_REQUEST_GUID "1C9AA97E-9C05-4583-A3BD-908A196F1E92"
-#define MSN_FT_GUID "5D3E02AB-6190-11D3-BBBB-00C04F795683"
-#define MSN_OBJ_GUID "A4268EEC-FEC5-49E5-95C3-F126696BDBF6"
-
-#define MSN_CLIENTINFO \
- "Client-Name: Purple/" VERSION "\r\n" \
- "Chat-Logging: Y\r\n"
-
-/* Index into attention_types */
-#define MSN_NUDGE 0
-
typedef enum
{
MSN_LIST_FL_OP = 0x01,
@@ -84,7 +31,6 @@ typedef enum
MSN_LIST_BL_OP = 0x04,
MSN_LIST_RL_OP = 0x08,
MSN_LIST_PL_OP = 0x10
-
} MsnListOp;
#define MSN_LIST_OP_MASK 0x07
@@ -112,7 +58,6 @@ typedef enum
MSN_CLIENT_CAP_ONECARE = 0x1000000,
MSN_CLIENT_CAP_P2P_TURN = 0x2000000,
MSN_CLIENT_CAP_P2P_BOOTSTRAP_VIA_UUN = 0x4000000,
-
} MsnClientCaps;
typedef enum
@@ -134,9 +79,61 @@ typedef enum
MSN_CLIENT_VER_8_5 = 0x80, /* MSNC8 */
MSN_CLIENT_VER_9_0 = 0x90, /* MSNC9 */
MSN_CLIENT_VER_14_0 = 0xA0 /* MSNC10 */
+} MsnClientVerId;
-} MsnClientVerId;
+#include "internal.h"
+#include "account.h"
+#include "accountopt.h"
+#include "blist.h"
+#include "connection.h"
+#include "conversation.h"
+#include "debug.h"
+#include "cipher.h"
+#include "notify.h"
+#include "privacy.h"
+#include "proxy.h"
+#include "prpl.h"
+#include "request.h"
+#include "servconn.h"
+#include "sslconn.h"
+#include "util.h"
+
+#include "ft.h"
+
+#include "msg.h"
+
+#define MSN_BUF_LEN 8192
+
+/* Windows Live Messenger Server*/
+#define MSN_SERVER "messenger.hotmail.com"
+#define MSN_HTTPCONN_SERVER "gateway.messenger.hotmail.com"
+#define MSN_PORT 1863
+#define WLM_PROT_VER 15
+
+#define WLM_MAX_PROTOCOL 15
+#define WLM_MIN_PROTOCOL 15
+
+#define MSN_TYPING_RECV_TIMEOUT 6
+#define MSN_TYPING_SEND_TIMEOUT 4
+
+#define PROFILE_URL "http://spaces.live.com/profile.aspx?mem="
+#define PHOTO_URL " contactparams:photopreauthurl=\""
+
+#define BUDDY_ALIAS_MAXLEN 387
+
+#define MSN_CAM_GUID "4BD96FC0-AB17-4425-A14A-439185962DC8"
+#define MSN_CAM_REQUEST_GUID "1C9AA97E-9C05-4583-A3BD-908A196F1E92"
+#define MSN_FT_GUID "5D3E02AB-6190-11D3-BBBB-00C04F795683"
+#define MSN_OBJ_GUID "A4268EEC-FEC5-49E5-95C3-F126696BDBF6"
+
+#define MSN_CLIENTINFO \
+ "Client-Name: Purple/" VERSION "\r\n" \
+ "Chat-Logging: Y\r\n"
+
+/* Index into attention_types */
+#define MSN_NUDGE 0
+
#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_im_message(MsnSession *ses
void msn_send_privacy(PurpleConnection *gc);
void msn_send_im_message(MsnSession *session, MsnMessage *msg);
-#endif /* _MSN_H_ */
+#endif /* MSN_H */
============================================================
--- libpurple/protocols/msn/msnutils.h 8f950ea5cb2bd02b6a41704fede8dd51cc1f0c1d
+++ libpurple/protocols/msn/msnutils.h ac95cf7b1395659d2fcd9793164551ad6830b03d
@@ -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_handle_chl(char *input, char *o
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 */
============================================================
--- libpurple/protocols/msn/nexus.h 883897035b9e94bb68d8e56415d5a3d4cd794cb1
+++ libpurple/protocols/msn/nexus.h 5d8b0b6467ba5c8b39fe3e72a1e8b07a30806c50
@@ -21,9 +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_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 @@ typedef enum
"</Body>"\
"</Envelope>"
-typedef struct _MsnUsrKey MsnUsrKey;
struct _MsnUsrKey
{
int size; /* 28. Does not count data */
@@ -199,7 +202,6 @@ struct _MsnUsrKey
char cipher[72];
};
-typedef struct _MsnTicketToken MsnTicketToken;
struct _MsnTicketToken {
GHashTable *token;
char *secret;
@@ -207,8 +209,6 @@ struct _MsnTicketToken {
GSList *updates;
};
-typedef struct _MsnNexus MsnNexus;
-
struct _MsnNexus
{
MsnSession *session;
@@ -230,5 +230,5 @@ void msn_nexus_update_token(MsnNexus *ne
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 */
============================================================
--- libpurple/protocols/msn/notification.h efe0cdabd251a4338c91706bf251c3129e0bba70
+++ libpurple/protocols/msn/notification.h de4a25627d786e63a8c662cb4063fa38f984c5cd
@@ -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 at 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 *ses
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 *se
void msn_got_login_params(MsnSession *session, const char *ticket, const char *response);
-#endif /* _MSN_NOTIFICATION_H_ */
+#endif /* MSN_NOTIFICATION_H */
============================================================
--- libpurple/protocols/msn/object.h 457ca8e59ae21d8b7f6c0621cae76084ae91d28c
+++ libpurple/protocols/msn/object.h f5a5dae07ab4241782ca9e84c8e5e6f9f85924a4
@@ -21,13 +21,9 @@
* 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_
+#ifndef MSN_OBJECT_H
+#define MSN_OBJECT_H
-#include "imgstore.h"
-
-#include "internal.h"
-
typedef enum
{
MSN_OBJECT_UNKNOWN = -1, /**< Unknown object */
@@ -36,9 +32,12 @@ typedef enum
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
{
gboolean local;
@@ -51,7 +50,6 @@ typedef struct
char *friendly;
char *sha1d;
char *sha1c;
-
} MsnObject;
/**
@@ -239,4 +237,4 @@ void msn_object_set_local(MsnObject *obj
void msn_object_set_local(MsnObject *obj);
-#endif /* _MSN_OBJECT_H_ */
+#endif /* MSN_OBJECT_H */
============================================================
--- libpurple/protocols/msn/oim.h f85e2f999547807db2c40c7f96696a75b802fa25
+++ libpurple/protocols/msn/oim.h 2623762bd75fe3df006fed88ee0794b206a21c08
@@ -22,9 +22,11 @@
* 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"
#define MSN_OIM_RETRIEVE_URL "/rsi/rsi.asmx"
@@ -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);
void msn_oim_send_msg(MsnOim *oim);
-#endif/* _MSN_OIM_H_*/
+#endif/* MSN_OIM_H*/
============================================================
--- libpurple/protocols/msn/page.h 08a76b6e899cd5ad2c19d35b6d5aca9275aab6ca
+++ libpurple/protocols/msn/page.h 93a219c2a280acfa86054e8a7100ff6c8a3aa583
@@ -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 MsnP
*/
const char *msn_page_get_body(const MsnPage *page);
-#endif /* _MSN_PAGE_H_ */
+#endif /* MSN_PAGE_H */
============================================================
--- libpurple/protocols/msn/servconn.h f141547c3b7e96114d6dbfb6ec7b94b0f0901b2c
+++ libpurple/protocols/msn/servconn.h 99939640f79da9204a83d964d1801ace91a21123
@@ -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 @@ typedef enum
MSN_SERVCONN_ERROR_CONNECT,
MSN_SERVCONN_ERROR_WRITE,
MSN_SERVCONN_ERROR_READ
-
} MsnServConnError;
/**
@@ -51,9 +44,14 @@ typedef enum
{
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(MsnSe
*/
void msn_servconn_set_idle_timeout(MsnServConn *servconn, guint seconds);
-#endif /* _MSN_SERVCONN_H_ */
+#endif /* MSN_SERVCONN_H */
============================================================
--- libpurple/protocols/msn/session.h 5589e6d7704692363db810d99c0f545997d66bc5
+++ libpurple/protocols/msn/session.h fa957a252c7e3f1a95bb1815c22cc0486088c53a
@@ -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 @@ typedef enum
MSN_ERROR_SIGN_OTHER,
MSN_ERROR_SERV_DOWN,
MSN_ERROR_SERV_UNAVAILABLE
-
} MsnErrorType;
/**
@@ -73,11 +56,22 @@ typedef enum
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
void msn_session_report_user(MsnSession *session,const char *passport,
const char *msg,PurpleMessageFlags flags);
-#endif /* _MSN_SESSION_H_ */
+#endif /* MSN_SESSION_H */
============================================================
--- libpurple/protocols/msn/slp.h 981c05d321621f9f938e6ead93daa9a31099c794
+++ libpurple/protocols/msn/slp.h a4773cbad2874aa2d78c47a4e9cd907c1fee0850
@@ -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 "slpcall.h"
-#include "session.h"
#include "internal.h"
+
#include "ft.h"
+#include "session.h"
+#include "slpcall.h"
MsnSlpCall * msn_slp_sip_recv(MsnSlpLink *slplink,
const char *body);
@@ -45,4 +46,4 @@ void msn_queue_buddy_icon_request(MsnUse
void msn_queue_buddy_icon_request(MsnUser *user);
-#endif /* _MSN_SLP_H_ */
+#endif /* MSN_SLP_H */
============================================================
--- libpurple/protocols/msn/slpcall.h 704615e339ead6c0591938878f41c540024b06e0
+++ libpurple/protocols/msn/slpcall.h 5f42b8ecb787d6d17126d372d175636f179d11dc
@@ -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
-#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;
-} MsnSlpCallType;
+#include "internal.h"
+#include "ft.h"
+
+#include "slplink.h"
+
+/* The official client seems to timeout slp calls after 5 minutes */
+#define MSN_SLPCALL_TIMEOUT 300
+
struct _MsnSlpCall
{
/* Our parent slplink */
@@ -95,4 +95,4 @@ void msn_slpcall_close(MsnSlpCall *slpca
int app_id, const char *context);
void msn_slpcall_close(MsnSlpCall *slpcall);
-#endif /* _MSN_SLPCALL_H_ */
+#endif /* MSN_SLPCALL_H */
============================================================
--- libpurple/protocols/msn/slplink.h 1074709379db252e5f89425dd305aca194878d29
+++ libpurple/protocols/msn/slplink.h 45e42061dd6c5fa0c89c80de95eea64a23a09fab
@@ -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(MsnSlpLi
MsnSlpCall *msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
-#endif /* _MSN_SLPLINK_H_ */
+#endif /* MSN_SLPLINK_H */
============================================================
--- libpurple/protocols/msn/soap.h 431f8fcb8696914d560036a4061dbd1ec2458d81
+++ libpurple/protocols/msn/soap.h 6110b8052062d724f1e4cea9f3bad29e99d23beb
@@ -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 "session.h"
-#include "sslconn.h"
+#include <glib.h>
+
#include "xmlnode.h"
-#include <glib.h>
+#include "session.h"
+#include "sslconn.h"
-typedef struct _MsnSoapMessage MsnSoapMessage;
typedef void (*MsnSoapCallback)(MsnSoapMessage *request,
MsnSoapMessage *response, gpointer cb_data);
@@ -48,4 +49,4 @@ void msn_soap_message_send(MsnSession *s
const char *host, const char *path, gboolean secure,
MsnSoapCallback cb, gpointer cb_data);
-#endif
+#endif /* MSN_SOAP_H */
============================================================
--- libpurple/protocols/msn/state.c 77d680019ffcec0214c07aeeddc585256c5e5ad1
+++ libpurple/protocols/msn/state.c 51a2df6ef8b5b2dbb8fc4fa6de766ee20fbeafec
@@ -23,6 +23,7 @@
*/
#include "internal.h"
+
#include "core.h"
#include "msn.h"
============================================================
--- libpurple/protocols/msn/state.h 039d881b2f76f350b869d7b415abeb71e82854fc
+++ libpurple/protocols/msn/state.h 265267af7d83e7d12ab919bfc525608dc30fc7db
@@ -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 @@ typedef enum
MSN_LUNCH = 7,
MSN_OFFLINE = 8,
MSN_HIDDEN = 9
-
} MsnAwayType;
/**
@@ -62,11 +61,11 @@ void msn_set_psm(MsnSession *session);
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 */
============================================================
--- libpurple/protocols/msn/switchboard.h 3c7c9cb35758d19bce0b7ea8b859a9dff2640a50
+++ libpurple/protocols/msn/switchboard.h 5310ab6d4f8597622ec30b946d77f6f5c01e4653
@@ -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;
-} 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(MsnSwitchB
void msn_switchboard_show_ink(MsnSwitchBoard *swboard, const char *passport,
const char *data);
-#endif /* _MSN_SWITCHBOARD_H_ */
+#endif /* MSN_SWITCHBOARD_H */
============================================================
--- libpurple/protocols/msn/sync.h d595acf0aaff871aac1e4e35a2c3eb7528454bc1
+++ libpurple/protocols/msn/sync.h aa5450320af2007ee2679cbfdc587e39711135ed
@@ -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_end(void);
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 */
============================================================
--- libpurple/protocols/msn/table.h 7e7d867aa720802926c279840b6a238f76d1beb0
+++ libpurple/protocols/msn/table.h 3a3e99f624b7aba158045d1389b90ebbdfd0c0e0
@@ -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_msg_type(MsnTable *ta
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 */
============================================================
--- libpurple/protocols/msn/transaction.h 623b8d18405ad7e9169b7c290679d40489ecc502
+++ libpurple/protocols/msn/transaction.h 5c879d6d9025c1bd4fd82b1d4cab151b26ae8c33
@@ -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_timeout_cb(MsnT
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 */
============================================================
--- libpurple/protocols/msn/user.h d7f7b1e66fd678769663d097542648a4a1a019fe
+++ libpurple/protocols/msn/user.h 8275625d622e350db839897f6a011187ad153b3b
@@ -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 @@ typedef enum
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 @@ const char *msn_user_get_invite_message(
/**
* 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 */
============================================================
--- libpurple/protocols/msn/userlist.h 916ccc8bda88abcc02c9356d0364a62c255cee96
+++ libpurple/protocols/msn/userlist.h d43232b8a904491f8b93d74542278733e8c2e43d
@@ -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 @@ typedef enum
MSN_LIST_PL /**< Pending list */
} MsnListId;
+#include "group.h"
+#include "user.h"
struct _MsnUserList
{
@@ -101,4 +100,4 @@ void msn_userlist_load(MsnSession *sessi
void msn_userlist_load(MsnSession *session);
-#endif /* _MSN_USERLIST_H_ */
+#endif /* MSN_USERLIST_H */
More information about the Commits
mailing list