Mercurial > pidgin
comparison libpurple/protocols/oscar/oscarcommon.h @ 28504:bb923bcae9de
merge of '661db628ce40c3548058f062ea72d9687654d53a'
and '8a71ac6c6bfac72c7077754c4d8178b77f14b18f'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 04 Nov 2009 22:16:51 +0000 |
parents | a990da4540d3 |
children | 259bbfb423d4 |
comparison
equal
deleted
inserted
replaced
28503:86ff30fb8ae3 | 28504:bb923bcae9de |
---|---|
92 void oscar_send_file(PurpleConnection *gc, const char *who, const char *file); | 92 void oscar_send_file(PurpleConnection *gc, const char *who, const char *file); |
93 PurpleXfer *oscar_new_xfer(PurpleConnection *gc, const char *who); | 93 PurpleXfer *oscar_new_xfer(PurpleConnection *gc, const char *who); |
94 gboolean oscar_offline_message(const PurpleBuddy *buddy); | 94 gboolean oscar_offline_message(const PurpleBuddy *buddy); |
95 void oscar_format_username(PurpleConnection *gc, const char *nick); | 95 void oscar_format_username(PurpleConnection *gc, const char *nick); |
96 GList *oscar_actions(PurplePlugin *plugin, gpointer context); | 96 GList *oscar_actions(PurplePlugin *plugin, gpointer context); |
97 void oscar_init(PurplePluginProtocolInfo *prpl_info); | 97 void oscar_init(PurplePlugin *plugin); |