Mercurial > pidgin
comparison libpurple/server.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 | eb8c8a926589 |
comparison
equal
deleted
inserted
replaced
| 23809:7d2e5f57dbca | 23810:10f5a529d2a6 |
|---|---|
| 181 void serv_got_chat_left(PurpleConnection *g, int id); | 181 void serv_got_chat_left(PurpleConnection *g, int id); |
| 182 void serv_got_chat_in(PurpleConnection *g, int id, const char *who, | 182 void serv_got_chat_in(PurpleConnection *g, int id, const char *who, |
| 183 PurpleMessageFlags flags, const char *message, time_t mtime); | 183 PurpleMessageFlags flags, const char *message, time_t mtime); |
| 184 void serv_send_file(PurpleConnection *gc, const char *who, const char *file); | 184 void serv_send_file(PurpleConnection *gc, const char *who, const char *file); |
| 185 | 185 |
| 186 #ifdef USE_FARSIGHT | 186 #ifdef USE_VV |
| 187 PurpleMedia *serv_initiate_media(PurpleConnection *gc, const char *who, | 187 PurpleMedia *serv_initiate_media(PurpleConnection *gc, const char *who, |
| 188 PurpleMediaStreamType type); | 188 PurpleMediaStreamType type); |
| 189 gboolean serv_can_do_media(PurpleConnection *gc, const char *who, | 189 gboolean serv_can_do_media(PurpleConnection *gc, const char *who, |
| 190 PurpleMediaStreamType type); | 190 PurpleMediaStreamType type); |
| 191 #else | 191 #else |