Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 19487:c9de28101e6d | 19488:ebe2d2e71223 |
|---|---|
| 4326 yahoo_new_xfer, | 4326 yahoo_new_xfer, |
| 4327 yahoo_offline_message, /* offline_message */ | 4327 yahoo_offline_message, /* offline_message */ |
| 4328 &yahoo_whiteboard_prpl_ops, | 4328 &yahoo_whiteboard_prpl_ops, |
| 4329 NULL, /* send_raw */ | 4329 NULL, /* send_raw */ |
| 4330 NULL, /* roomlist_room_serialize */ | 4330 NULL, /* roomlist_room_serialize */ |
| 4331 NULL, /* unregister_user */ | |
| 4331 | 4332 |
| 4332 #ifdef YAHOO_USE_ATTENTION_API | 4333 #ifdef YAHOO_USE_ATTENTION_API |
| 4333 yahoo_send_attention, | 4334 yahoo_send_attention, |
| 4334 yahoo_attention_types, | 4335 yahoo_attention_types, |
| 4335 #else | 4336 #else |
| 4336 NULL, | 4337 NULL, |
| 4337 NULL, | 4338 NULL, |
| 4338 #endif | 4339 #endif |
| 4339 | 4340 |
| 4340 /* padding */ | 4341 /* padding */ |
| 4341 NULL, | |
| 4342 NULL | 4342 NULL |
| 4343 }; | 4343 }; |
| 4344 | 4344 |
| 4345 static PurplePluginInfo info = | 4345 static PurplePluginInfo info = |
| 4346 { | 4346 { |