diff libpurple/protocols/msn/user.h @ 28983:462cb893521b

Minor header file cleanup. Mostly I wanted to move some enums above some #includes

--- 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 */