Mercurial > pidgin3 / file diff

--- a/libpurple/prpl.h	Sat Dec 29 17:45:47 2007 +0000
+++ b/libpurple/prpl.h	Wed Feb 06 19:11:25 2008 +0000
@@ -394,24 +394,23 @@
 	 * reasons.
 	 */
 	void (*unregister_user)(PurpleAccount *, PurpleAccountUnregistrationCb cb, void *user_data);
-	
+
 	/* Attention API for sending & receiving zaps/nudges/buzzes etc. */
 	gboolean (*send_attention)(PurpleConnection *gc, const char *username, guint type);
 	GList *(*get_attention_types)(PurpleAccount *acct);
 
-	void (*_purple_reserved4)(void);
-	GList *(*attention_types)(PurpleAccount *acct);
+	/* Make sure you do not try to dereference anything past struct_size! */
+	int struct_size;
+
 #ifdef USE_FARSIGHT
 	PurpleMedia  *(*initiate_media)(PurpleConnection *conn, const char *who, PurpleMediaStreamType type);
 #else
 	void (*initiate_media)(void);
 #endif
-	/* Make sure you do not try to dereference anything past struct_size! */
-	int struct_size;
 };
 
 #define PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl, member) \
-	((G_STRUCT_OFFSET(PurpleProtocolPluginInfo, member) < prpl->struct_size) && \
+	((G_STRUCT_OFFSET(PurplePluginProtocolInfo, member) < prpl->struct_size) && \
 	 prpl->member != NULL)
 
 #define PURPLE_IS_PROTOCOL_PLUGIN(plugin) \
@@ -559,3 +558,4 @@
 #endif
 
 #endif /* _PRPL_H_ */
+