comparison libpurple/protocols/jabber/libxmpp.c @ 20685:02df6998b466

propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 4ad1081695d083df424898e6e7091f731b401265) to branch 'im.pidgin.pidgin' (head d33243e8f5347776c81f81a0e4ba3a76ae5505a5)
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 16:34:43 +0000
parents 56cec2b6ff98
children 3cc856ca2338
comparison
equal deleted inserted replaced
20258:509ca8ebe515 20685:02df6998b466
111 jabber_offline_message, /* offline_message */ 111 jabber_offline_message, /* offline_message */
112 NULL, /* whiteboard_prpl_ops */ 112 NULL, /* whiteboard_prpl_ops */
113 jabber_prpl_send_raw, /* send_raw */ 113 jabber_prpl_send_raw, /* send_raw */
114 jabber_roomlist_room_serialize, /* roomlist_room_serialize */ 114 jabber_roomlist_room_serialize, /* roomlist_room_serialize */
115 jabber_unregister_account, /* unregister_user */ 115 jabber_unregister_account, /* unregister_user */
116 jabber_send_attention, /* send_attention */
117 jabber_attention_types, /* attention_types */
116 118
117 /* padding */ 119 /* padding */
118 NULL,
119 NULL,
120 NULL 120 NULL
121 }; 121 };
122 122
123 static gboolean load_plugin(PurplePlugin *plugin) 123 static gboolean load_plugin(PurplePlugin *plugin)
124 { 124 {