diff src/protocols/yahoo/yahoo.c @ 11338:17142948653e

[gaim-migrate @ 13551] Change the GAIM_CONV_IM and GAIM_CONV_CHAT enums to GAIM_CONV_TYPE_IM and GAIM_CONV_TYPE_CHAT. This touched A LOT of files. Also combined two oscar header files (one of them was small and dorky). committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 25 Aug 2005 02:33:44 +0000
parents 519dc2186438
children 7fab28c991f3
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo.c	Thu Aug 25 00:27:12 2005 +0000
+++ b/src/protocols/yahoo/yahoo.c	Thu Aug 25 02:33:44 2005 +0000
@@ -713,7 +713,7 @@
 		gaim_str_strip_cr(m);
 
 		if (!strcmp(m, "<ding>")) {
-			GaimConversation *c = gaim_conversation_new(GAIM_CONV_IM,
+			GaimConversation *c = gaim_conversation_new(GAIM_CONV_TYPE_IM,
 			                                            gaim_connection_get_account(gc), im->from);
 			gaim_conv_im_write(GAIM_CONV_IM(c), "", _("Buzz!!"), GAIM_MESSAGE_NICK|GAIM_MESSAGE_RECV,
 			                   im->time);
@@ -1688,7 +1688,7 @@
 	serv_add_deny(account->gc, name);
 
 	/* The follow should really be done by the core... */
-	conv = gaim_find_conversation_with_account(GAIM_CONV_IM, name, account);
+	conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, name, account);
 
 	if (conv != NULL)
 		gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE);