[Gaim-commits] CVS: gaim/src/protocols/novell novell.c,1.40,1.41

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/novell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9012/src/protocols/novell

Modified Files:
	novell.c 
Log Message:
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.


Index: novell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/novell/novell.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -p -r1.40 -r1.41
--- novell.c	18 Oct 2004 19:02:29 -0000	1.40
+++ novell.c	23 Nov 2004 06:14:13 -0000	1.41
@@ -194,7 +194,9 @@ _get_details_resp_send_msg(NMUser * user
 		if (user_record) {
 
 			/* Set the title for the conversation */
-			gconv =	gaim_find_conversation_with_account(nm_user_record_get_display_id(user_record),
+			/* XXX - Should this be GAIM_CONV_IM? */
+			gconv =	gaim_find_conversation_with_account(GAIM_CONV_ANY,
+														nm_user_record_get_display_id(user_record),
 														(GaimAccount *) user->client_data);
 			if (gconv) {
 
@@ -1760,7 +1762,7 @@ _evt_receive_message(NMUser * user, NMEv
 							text, imflags,
 							nm_event_get_gmt(event));
 
-				gconv =	gaim_find_conversation_with_account(
+				gconv =	gaim_find_conversation_with_account(GAIM_CONV_IM,
 					nm_user_record_get_display_id(user_record),
 					(GaimAccount *) user->client_data);
 				if (gconv) {
@@ -2034,8 +2036,10 @@ _evt_undeliverable_status(NMUser * user,
 
 	ur = nm_find_user_record(user, nm_event_get_source(event));
 	if (ur) {
+		/* XXX - Should this be GAIM_CONV_IM? */
 		gconv =
-			gaim_find_conversation_with_account(nm_user_record_get_display_id(ur),
+			gaim_find_conversation_with_account(GAIM_CONV_ANY,
+												nm_user_record_get_display_id(ur),
 												user->client_data);
 		if (gconv) {
 			const char *name = nm_user_record_get_full_name(ur);