Merging libpurple branch into killerbee. It's fairly usable already, and

Debian packaging is now properly separated. This also picks up a load of
stuff from mainline it seems.

1 files changed, 3 insertions, 0 deletions

diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index 324a2b46..21b461f8 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -133,6 +133,7 @@ struct prpl {
 	/* You should set this to the name of your protocol.
 	 * - The user sees this name ie. when imcb_log() is used. */
 	const char *name;
+	void *data;
 
 	/* Added this one to be able to add per-account settings, don't think
 	 * it should be used for anything else. You are supposed to use the
@@ -306,6 +307,7 @@ G_MODULE_EXPORT void imcb_chat_invited( struct im_connection *ic, char *handle,
  *   the user her/himself. At that point the group chat will be visible to the
  *   user, too. */
 G_MODULE_EXPORT struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle );
+G_MODULE_EXPORT void imcb_chat_name_hint( struct groupchat *c, const char *name );
 G_MODULE_EXPORT void imcb_chat_add_buddy( struct groupchat *b, const char *handle );
 /* To remove a handle from a group chat. Reason can be NULL. */
 G_MODULE_EXPORT void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char *reason );
@@ -328,6 +330,7 @@ void imc_add_block( struct im_connection *ic, char *handle );
 void imc_rem_block( struct im_connection *ic, char *handle );
 
 /* Misc. stuff */
+char *set_eval_timezone( set_t *set, char *value );
 char *set_eval_away_devoice( set_t *set, char *value );
 gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond );
 void cancel_auto_reconnect( struct account *a );