diff src/protocols/zephyr/zephyr.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 90be432e8385
children a26eb48d1953
line wrap: on
line diff
--- a/src/protocols/zephyr/zephyr.c	Thu Aug 25 00:27:12 2005 +0000
+++ b/src/protocols/zephyr/zephyr.c	Thu Aug 25 02:33:44 2005 +0000
@@ -861,7 +861,7 @@
 
 			serv_got_chat_in(gc, zt2->id, send_inst_utf8, 0, buf3, time(NULL));
 			g_free(send_inst);
-			gconv1 = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+			gconv1 = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
 														 zt2->name, gc->account);
 			gcc = gaim_conversation_get_chat_data(gconv1);
 
@@ -2008,7 +2008,7 @@
 
 	sig = zephyr_get_signature();
 
-	gconv1 = gaim_find_conversation_with_account(GAIM_CONV_CHAT, zt->name,
+	gconv1 = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, zt->name,
 												 gc->account);
 	gcc = gaim_conversation_get_chat_data(gconv1);
 
@@ -2469,7 +2469,7 @@
 	/* find_sub_by_id can return NULL */
 	if (!zt) 
 		return;
-	gconv = gaim_find_conversation_with_account(GAIM_CONV_CHAT, zt->name,
+	gconv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, zt->name,
 												gc->account);
 	gcc = gaim_conversation_get_chat_data(gconv);