# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1247611672 0
# Node ID 205267108d6e8f67dfb0ed15051716a33ce09ea6
# Parent  e574d1858b5ad9f3b9a2004235f02faba3a3473d# Parent  d953b613a79428ab25f8e1e1a9cb78afbc2343d7
merge of '27b0c8383de99fccc9cd6f312ac355f9e4a4d267'
     and 'd5aa8b561c618705b25a69e3c0aaea812f4abee6'

diff -r d953b613a794 -r 205267108d6e libpurple/privacy.h
--- a/libpurple/privacy.h	Tue Jul 14 22:47:42 2009 +0000
+++ b/libpurple/privacy.h	Tue Jul 14 22:47:52 2009 +0000
@@ -26,12 +26,10 @@
 #ifndef _PURPLE_PRIVACY_H_
 #define _PURPLE_PRIVACY_H_
 
-#include "account.h"
-
 /**
  * Privacy data types.
  */
-typedef enum _PurplePrivacyType
+typedef enum
 {
 	PURPLE_PRIVACY_ALLOW_ALL = 1,
 	PURPLE_PRIVACY_DENY_ALL,
@@ -40,6 +38,8 @@
 	PURPLE_PRIVACY_ALLOW_BUDDYLIST
 } PurplePrivacyType;
 
+#include "account.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif