Mercurial > pidgin
diff libpurple/prpl.h @ 19488:ebe2d2e71223
Fixed merge errors stemming from the fact that the main branch and my branch both added something to the prpl struct
author | Andreas Monitzer <pidgin@monitzer.com> |
---|---|
date | Tue, 28 Aug 2007 07:09:48 +0000 |
parents | 472bcd9d502e |
children | 481749fc0b6b |
line wrap: on
line diff
--- a/libpurple/prpl.h Tue Aug 28 07:03:28 2007 +0000 +++ b/libpurple/prpl.h Tue Aug 28 07:09:48 2007 +0000 @@ -357,7 +357,7 @@ gboolean (*send_attention)(PurpleConnection *gc, const char *username, guint type); GList *(*attention_types)(PurpleAccount *acct); - void (*_purple_reserved3)(void); + void (*_purple_reserved1)(void); }; #define PURPLE_IS_PROTOCOL_PLUGIN(plugin) \