Mercurial > pidgin
diff libpurple/protocols/msn/msn.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 | 481749fc0b6b |
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 };