diff options
Diffstat (limited to 'libpurple/protocols/msn/object.h')
| -rw-r--r-- | libpurple/protocols/msn/object.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libpurple/protocols/msn/object.h b/libpurple/protocols/msn/object.h index 3771d378b9..7bcab67514 100644 --- a/libpurple/protocols/msn/object.h +++ b/libpurple/protocols/msn/object.h @@ -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,9 +32,12 @@ typedef enum MSN_OBJECT_USERTILE = 3, /**< UserTile (buddy icon) */ MSN_OBJECT_RESERVED2 = 4, /**< Reserved */ MSN_OBJECT_BACKGROUND = 5 /**< Background */ - } 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 @@ PurpleStoredImage *msn_object_get_image(const MsnObject *obj); void msn_object_set_local(MsnObject *obj); -#endif /* _MSN_OBJECT_H_ */ +#endif /* MSN_OBJECT_H */ |