diff src/server.c @ 10246:a66cf83552dc

[gaim-migrate @ 11386] I changed gaim_find_conversation and gaim_find_conversation_with_account The first parameter is now one of GAIM_CONV_IM, GAIM_CONV_CHAT or GAIM_CONV_ANY. Unfortunately, this changes a bajillion files. Please look over this and make sure I use the correct type everywhere. Especially in Novell and MSN, and somewhat in SILC. committer: Tailor Script <[e-mail]>

--- a/src/server.c	Tue Nov 23 05:53:59 2004 +0000
+++ b/src/server.c	Tue Nov 23 06:14:15 2004 +0000
@@ -267,7 +267,7 @@
 	account  = gaim_connection_get_account(gc);
 	presence = gaim_account_get_presence(account);
 
-	conv = gaim_find_conversation_with_account(name, gc->account);
+	conv = gaim_find_conversation_with_account(GAIM_CONV_IM, name, gc->account);
 
 	if (prpl_info && prpl_info->send_im)
 		val = prpl_info->send_im(gc, name, message, imflags);
@@ -463,7 +463,7 @@
 		b = buds->data;
 		gaim_blist_server_alias_buddy(b, alias);
 
-		conv = gaim_find_conversation_with_account(b->name, account);
+		conv = gaim_find_conversation_with_account(GAIM_CONV_IM, b->name, account);
 
 		if (conv != NULL && b->server_alias != NULL &&
 			strcmp(b->server_alias, alias))
@@ -790,7 +790,7 @@
 	 * We should update the conversation window buttons and menu,
 	 * if it exists.
 	 */
-	cnv = gaim_find_conversation_with_account(who, gc->account);
+	cnv = gaim_find_conversation_with_account(GAIM_CONV_IM, who, gc->account);
 
 	/*
 	 * Plugin stuff. we pass a char ** but we don't want to pass what's
@@ -1024,7 +1024,7 @@
 #if 0
 		if (docklet_count &&
 		    gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages") &&
-		    !gaim_find_conversation_with_account(name, gc->account)) {
+		    !gaim_find_conversation_with_account(GAIM_CONV_IM, name, gc->account)) {
 			/*
 			 * We're gonna queue it up and wait for the user to ask for
 			 * it... probably by clicking the docklet or windows tray icon.
@@ -1058,9 +1058,10 @@
 					 GaimTypingState state) {
 
 	GaimBuddy *b;
-	GaimConversation *cnv = gaim_find_conversation_with_account(name, gc->account);
+	GaimConversation *cnv;
 	GaimConvIm *im;
 
+	cnv = gaim_find_conversation_with_account(GAIM_CONV_IM, name, gc->account);
 	if (!cnv)
 		return;
 
@@ -1092,10 +1093,11 @@
 
 void serv_got_typing_stopped(GaimConnection *gc, const char *name) {
 
-	GaimConversation *c = gaim_find_conversation_with_account(name, gc->account);
+	GaimConversation *c;
 	GaimConvIm *im;
 	GaimBuddy *b;
 
+	c = gaim_find_conversation_with_account(GAIM_CONV_IM, name, gc->account);
 	if (!c)
 		return;