# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1317511490 0
# Node ID c774000690b41fa6e32f43864a43c110cf6883e3
# Parent  0a2cb0061be10f232899c7e5d875df5b02669cb5# Parent  385ee739940c2f1cff050b85c567301577cf98b8
merge of '71541bfa4634807a1cfe0f67a9d648e640d4e293'
     and '7ed9ffe3e2f743a826c72d79aba093572e6c3ad4'

diff -r 385ee739940c -r c774000690b4 ChangeLog.API
--- a/ChangeLog.API	Sat Oct 01 21:54:15 2011 +0000
+++ b/ChangeLog.API	Sat Oct 01 23:24:50 2011 +0000
@@ -100,7 +100,6 @@
 		* _GntProgressBarOrientation
 		* _GntTreeColumnFlag
 		* _GntWidgetFlags
-		* _PurpleAccount.ui_data
 		* _PurpleCipherBatchMode
 		* _PurpleCipherCaps
 		* _PurpleCmdFlag
diff -r 385ee739940c -r c774000690b4 libpurple/account.h
--- a/libpurple/account.h	Sat Oct 01 21:54:15 2011 +0000
+++ b/libpurple/account.h	Sat Oct 01 23:24:50 2011 +0000
@@ -164,6 +164,7 @@
 	PurplePresence *presence;     /**< Presence.                              */
 	PurpleLog *system_log;        /**< The system log                         */
 
+	void *ui_data;              /**< The UI can put data here.              */
 	PurpleAccountRegistrationCb registration_cb;
 	void *registration_cb_user_data;