Mercurial > pidgin
diff libpurple/prpl.h @ 23810:10f5a529d2a6
merge of '38838bc806900103298d383237d2ae7cd60bbd82'
and '96c6198726fb7811a7762a8b11f05d257843729b'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Wed, 28 May 2008 21:13:36 +0000 |
| parents | ff29208e03ef cbe97caec684 |
| children | 3da0957e7821 |
line wrap: on
line diff
--- a/libpurple/prpl.h Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/prpl.h Wed May 28 21:13:36 2008 +0000 @@ -438,7 +438,7 @@ */ GHashTable *(*get_account_text_table)(PurpleAccount *account); -#ifdef USE_FARSIGHT +#ifdef USE_VV /** Initiate media with the given buddy */ PurpleMedia *(*initiate_media)(PurpleConnection *conn, const char *who, PurpleMediaStreamType type);