diff src/conversation.h @ 13965:df0dba522147

[gaim-migrate @ 16521] Merges soc-2006-chat-speed into trunk. (r16371:r16435) Joining large chat rooms, like IRC rooms, is much quicker. Additional improvment should be seen when using >=GTK+-2.6. committer: Tailor Script <[e-mail]>

--- a/src/conversation.h	Wed Jul 19 07:12:59 2006 +0000
+++ b/src/conversation.h	Wed Jul 19 20:14:58 2006 +0000
@@ -158,8 +158,8 @@
 	                   const char *message, GaimMessageFlags flags,
 	                   time_t mtime);
 
-	void (*chat_add_users)(GaimConversation *conv, GList *users,
-						   GList *flags, GList *aliases, gboolean new_arrivals);
+	void (*chat_add_users)(GaimConversation *conv, GList *cbuddies, gboolean new_arrivals);	
+	
 	void (*chat_rename_user)(GaimConversation *conv, const char *old_name,
 	                         const char *new_name, const char *new_alias);
 	void (*chat_remove_users)(GaimConversation *conv, GList *users);
@@ -214,6 +214,9 @@
 struct _GaimConvChatBuddy
 {
 	char *name;                      /**< The name                      */
+	char *alias;					 /**< The alias 					*/
+	char *alias_key;				 /**< The alias key					*/
+	gboolean buddy;					 /**< ChatBuddy is on the blist		*/
 	GaimConvChatBuddyFlags flags;    /**< Flags (ops, voice etc.)       */
 };
 
@@ -1133,11 +1136,12 @@
  * Creates a new chat buddy
  *
  * @param name The name.
+ * @param alias The alias.
  * @param flags The flags.
  *
  * @return The new chat buddy
  */
-GaimConvChatBuddy *gaim_conv_chat_cb_new(const char *name,
+GaimConvChatBuddy *gaim_conv_chat_cb_new(const char *name, const char *alias,
 										GaimConvChatBuddyFlags flags);
 
 /**