# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1247606710 0
# Node ID e574d1858b5ad9f3b9a2004235f02faba3a3473d
# Parent  32d2caa6a7772b31fa9f7dc6ff3c41f4408e41ba# Parent  0a0ece3477af96d0a5fd5edde9a9467d6741a47b
merge of '03e0254c6871c4730755a200d34d4adacdf40c66'
     and 'fe1b9e426c3f6f96ab00db928c3c9249746e5845'

diff -r 32d2caa6a777 -r e574d1858b5a libpurple/privacy.h
--- a/libpurple/privacy.h	Tue Jul 14 19:55:40 2009 +0000
+++ b/libpurple/privacy.h	Tue Jul 14 21:25:10 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