# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1134372943 0
# Node ID b1717befbb26f7f639282cfb0163d5a45884bcca
# Parent  398bdfe07c5728a282b20ca3a36f87f0151f6da2
[gaim-migrate @ 14773]
SF Patch #1377719 from Evan Schoenberg

"A recent reorganization of how the chat_add_users() conversation UI op is
 sent removed passing to the UI of whether the additions are new arrivals
 or not. This information lets the UI make decisions about how to handle
 the new people, what if anything to display, etc."

committer: Tailor Script <tailor@pidgin.im>

diff -r 398bdfe07c57 -r b1717befbb26 plugins/ChangeLog.API
--- a/plugins/ChangeLog.API	Mon Dec 12 07:35:33 2005 +0000
+++ b/plugins/ChangeLog.API	Mon Dec 12 07:35:43 2005 +0000
@@ -42,7 +42,8 @@
 	  const char *name, const char *alias
 	* gaim_conv_chat_add_users(), added extra_msgs and new_arrivals (pass NULL
 	  and FALSE respectively, to get the same behavior as before)
-	* chat_add_users in GaimConversationUiOps, added flags and aliases
+	* chat_add_users in GaimConversationUiOps, added flags, aliases,
+	  and new_arrivals
 	* chat_rename_user in GaimConversationUiOps, added new_alias
 	* GaimConversation.log became GList * GaimConversation.logs, so that a
 	  conversation can have multiple logs at once
diff -r 398bdfe07c57 -r b1717befbb26 src/conversation.c
--- a/src/conversation.c	Mon Dec 12 07:35:33 2005 +0000
+++ b/src/conversation.c	Mon Dec 12 07:35:43 2005 +0000
@@ -1522,7 +1522,7 @@
 	aliases = g_list_reverse(aliases);
 
 	if (ops != NULL && ops->chat_add_users != NULL)
-		ops->chat_add_users(conv, users, flags, aliases);
+		ops->chat_add_users(conv, users, flags, aliases, new_arrivals);
 
 	g_list_free(aliases);
 }
diff -r 398bdfe07c57 -r b1717befbb26 src/conversation.h
--- a/src/conversation.h	Mon Dec 12 07:35:33 2005 +0000
+++ b/src/conversation.h	Mon Dec 12 07:35:43 2005 +0000
@@ -152,7 +152,8 @@
 	                   const char *message, GaimMessageFlags flags,
 	                   time_t mtime);
 
-	void (*chat_add_users)(GaimConversation *conv, GList *users, GList *flags, GList *aliases);
+	void (*chat_add_users)(GaimConversation *conv, GList *users,
+						   GList *flags, GList *aliases, gboolean new_arrivals);
 	void (*chat_rename_user)(GaimConversation *conv, const char *old_name,
 	                         const char *new_name, const char *new_alias);
 	void (*chat_remove_user)(GaimConversation *conv, const char *user);
diff -r 398bdfe07c57 -r b1717befbb26 src/gtkconv.c
--- a/src/gtkconv.c	Mon Dec 12 07:35:33 2005 +0000
+++ b/src/gtkconv.c	Mon Dec 12 07:35:43 2005 +0000
@@ -4551,7 +4551,7 @@
 }
 
 static void
-gaim_gtkconv_chat_add_users(GaimConversation *conv, GList *users, GList *flags, GList *aliases)
+gaim_gtkconv_chat_add_users(GaimConversation *conv, GList *users, GList *flags, GList *aliases, gboolean new_arrivals)
 {
 	GaimConvChat *chat;
 	GaimGtkConversation *gtkconv;