Mercurial > pidgin.yaz
comparison libpurple/prpl.h @ 29775:e446b56c01e4
propagate from branch 'im.pidgin.pidgin' (head be77df4826034ac2521177bb6af6b60be3d1b4c4)
to branch 'im.pidgin.pidgin.next.minor' (head c0803026336ad6c803c2982ec7b0153378d71860)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 16 Feb 2010 15:16:44 +0000 |
| parents | 45a94940c122 |
| children | 185677f47825 |
comparison
equal
deleted
inserted
replaced
| 29454:5c9c4557fec2 | 29775:e446b56c01e4 |
|---|---|
| 901 */ | 901 */ |
| 902 gboolean purple_prpl_initiate_media(PurpleAccount *account, | 902 gboolean purple_prpl_initiate_media(PurpleAccount *account, |
| 903 const char *who, | 903 const char *who, |
| 904 PurpleMediaSessionType type); | 904 PurpleMediaSessionType type); |
| 905 | 905 |
| 906 /** | |
| 907 * Signals that the prpl received capabilities for the given contact. | |
| 908 * | |
| 909 * This function is intended to be used only by prpls. | |
| 910 * | |
| 911 * @param account The account the user is on. | |
| 912 * @param who The name of the contact for which capabilities have been received. | |
| 913 * @since 2.7.0 | |
| 914 */ | |
| 915 void purple_prpl_got_media_caps(PurpleAccount *account, const char *who); | |
| 916 | |
| 906 /*@}*/ | 917 /*@}*/ |
| 907 | 918 |
| 908 /**************************************************************************/ | 919 /**************************************************************************/ |
| 909 /** @name Protocol Plugin Subsystem API */ | 920 /** @name Protocol Plugin Subsystem API */ |
| 910 /**************************************************************************/ | 921 /**************************************************************************/ |