summaryrefslogtreecommitdiff
path: root/libpurple/prpl.h
diff options
context:
space:
mode:
authorSadrul Habib Chowdhury <sadrul@pidgin.im>2007-12-29 16:54:15 +0000
committerSadrul Habib Chowdhury <sadrul@pidgin.im>2007-12-29 16:54:15 +0000
commit7eca7d1d0f86b6d62ce424fc5cf377393fa21804 (patch)
tree6dc6143858849aead2e0a0eda104ffdeed0877c1 /libpurple/prpl.h
parent8031870a94e29d71caedc0bb03723fe5b4bc835e (diff)
downloadpidgin-7eca7d1d0f86b6d62ce424fc5cf377393fa21804.tar.gz
Fix the prplinfo structs and get rid of some compile warnings.
Diffstat (limited to 'libpurple/prpl.h')
-rw-r--r--libpurple/prpl.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/libpurple/prpl.h b/libpurple/prpl.h
index cc2988e5be..6373664553 100644
--- a/libpurple/prpl.h
+++ b/libpurple/prpl.h
@@ -394,24 +394,23 @@ struct _PurplePluginProtocolInfo
* 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)
+ 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) \