Mercurial > pidgin

comparison libpurple/protocols/msn/msn.c @ 19488:ebe2d2e71223

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
19487:c9de28101e6d 19488:ebe2d2e71223
2136 msn_new_xfer, /* new_xfer */ 2136 msn_new_xfer, /* new_xfer */
2137 msn_offline_message, /* offline_message */ 2137 msn_offline_message, /* offline_message */
2138 NULL, /* whiteboard_prpl_ops */ 2138 NULL, /* whiteboard_prpl_ops */
2139 NULL, /* send_raw */ 2139 NULL, /* send_raw */
2140 NULL, /* roomlist_room_serialize */ 2140 NULL, /* roomlist_room_serialize */
2141 NULL, /* unregister_user */
2141 2142
2142 #ifdef MSN_USE_ATTENTION_API 2143 #ifdef MSN_USE_ATTENTION_API
2143 msn_send_attention, /* send_attention */ 2144 msn_send_attention, /* send_attention */
2144 msn_attention_types, /* attention_types */ 2145 msn_attention_types, /* attention_types */
2145 #else 2146 #else
2146 /* padding */ 2147 /* padding */
2147 NULL, 2148 NULL,
2148 NULL, 2149 NULL,
2149 #endif 2150 #endif
2150 NULL,
2151 NULL 2151 NULL
2152 }; 2152 };
2153 2153
2154 static PurplePluginInfo info = 2154 static PurplePluginInfo info =
2155 { 2155 {