Mercurial > pidgin.yaz
changeset 32713:c774000690b4
merge of '71541bfa4634807a1cfe0f67a9d648e640d4e293'
and '7ed9ffe3e2f743a826c72d79aba093572e6c3ad4'
| author | Kevin Stange <kevin@simguy.net> |
|---|---|
| date | Sat, 01 Oct 2011 23:24:50 +0000 |
| parents | 0a2cb0061be1 (diff) 385ee739940c (current diff) |
| children | a34977b4d858 |
| files | libpurple/account.h |
| diffstat | 2 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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;