Mercurial > pidgin
diff libpurple/protocols/yahoo/yahoo.c @ 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 | d9d9283680a4 |
| children | 1d2002a5735e |
line wrap: on
line diff
--- 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 };