Mercurial > pidgin

comparison libpurple/protocols/myspace/myspace.c @ 19713:eabc8a32b1e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up an apparently bad merge with the reserved fields here.
author Richard Laager <rlaager@wiktel.com>
date Mon, 10 Sep 2007 20:29:29 +0000
parents 44b4e8bd759b
children 43a8cd1f708c
comparison
equal deleted inserted replaced
19712:437c320c8d29 19713:eabc8a32b1e4
2922 NULL, /* new_xfer */ 2922 NULL, /* new_xfer */
2923 msim_offline_message, /* offline_message */ 2923 msim_offline_message, /* offline_message */
2924 NULL, /* whiteboard_prpl_ops */ 2924 NULL, /* whiteboard_prpl_ops */
2925 msim_send_really_raw, /* send_raw */ 2925 msim_send_really_raw, /* send_raw */
2926 NULL, /* roomlist_room_serialize */ 2926 NULL, /* roomlist_room_serialize */
2927 NULL, /* unregister_user */
2927 #ifdef MSIM_USE_ATTENTION_API 2928 #ifdef MSIM_USE_ATTENTION_API
2928 msim_send_attention, /* send_attention */ 2929 msim_send_attention, /* send_attention */
2929 msim_attention_types, /* attention_types */ 2930 msim_attention_types, /* attention_types */
2930 #else 2931 #else
2931 NULL, /* _purple_reserved1 */
2932 NULL, /* _purple_reserved2 */ 2932 NULL, /* _purple_reserved2 */
2933 NULL, /* _purple_reserved3 */
2933 #endif 2934 #endif
2934 NULL, /* _purple_reserved3 */
2935 NULL /* _purple_reserved4 */ 2935 NULL /* _purple_reserved4 */
2936 }; 2936 };
2937 2937
2938 2938
2939 2939