Mercurial > pidgin.yaz
changeset 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 | c9de28101e6d |
| children | b0733d5d7621 |
| files | libpurple/protocols/msn/msn.c libpurple/protocols/yahoo/yahoo.c libpurple/prpl.h |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Tue Aug 28 07:03:28 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Tue Aug 28 07:09:48 2007 +0000 @@ -2138,6 +2138,7 @@ NULL, /* whiteboard_prpl_ops */ NULL, /* send_raw */ NULL, /* roomlist_room_serialize */ + NULL, /* unregister_user */ #ifdef MSN_USE_ATTENTION_API msn_send_attention, /* send_attention */ @@ -2147,7 +2148,6 @@ NULL, NULL, #endif - NULL, NULL };
--- a/libpurple/protocols/yahoo/yahoo.c Tue Aug 28 07:03:28 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Tue Aug 28 07:09:48 2007 +0000 @@ -4328,6 +4328,7 @@ &yahoo_whiteboard_prpl_ops, NULL, /* send_raw */ NULL, /* roomlist_room_serialize */ + NULL, /* unregister_user */ #ifdef YAHOO_USE_ATTENTION_API yahoo_send_attention, @@ -4338,7 +4339,6 @@ #endif /* padding */ - NULL, NULL };
--- 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) \