Mercurial > pidgin
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscarcommon.h Wed Nov 04 22:16:46 2009 +0000 +++ b/libpurple/protocols/oscar/oscarcommon.h Wed Nov 04 22:16:51 2009 +0000 @@ -94,4 +94,4 @@ gboolean oscar_offline_message(const PurpleBuddy *buddy); void oscar_format_username(PurpleConnection *gc, const char *nick); GList *oscar_actions(PurplePlugin *plugin, gpointer context); -void oscar_init(PurplePluginProtocolInfo *prpl_info); +void oscar_init(PurplePlugin *plugin);