diff plugins/crazychat/cc_network.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 <[e-mail]>

--- a/plugins/crazychat/cc_network.c	Thu Aug 25 00:27:12 2005 +0000
+++ b/plugins/crazychat/cc_network.c	Thu Aug 25 02:33:44 2005 +0000
@@ -104,9 +104,9 @@
 	if (session) return; /* already have a session with this guy */
 	session = cc_add_session(cc, name);
 	session->state = INVITE;
-	conv = gaim_find_conversation_with_account(GAIM_CONV_ANY, name, account);
+	conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, name, account);
 	if (!conv) {
-		conv = gaim_conversation_new(GAIM_CONV_IM, account, name);
+		conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, name);
 	}
 	im = gaim_conversation_get_im_data(conv);
 	snprintf(buf, BUFSIZ, "%s%s!%d", CRAZYCHAT_INVITE_CODE,
@@ -131,7 +131,7 @@
 	session = cc_find_session(cc, name);
 	if (!session) {
 		Debug("Creating a CrazyChat session invite dialog box!\n");
-		conv = gaim_find_conversation_with_account(GAIM_CONV_ANY, name, account);
+		conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, name, account);
 		if (conv) convwin = gaim_conversation_get_window(conv);
 		else convwin = NULL;
 		/* pop gtk window asking if want to accept */
@@ -208,9 +208,9 @@
 	GaimConversation *conv;
 	GaimConvIm *im;
 
-	conv = gaim_find_conversation_with_account(GAIM_CONV_ANY, session->name, account);
+	conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, session->name, account);
 	if (!conv) {
-		conv = gaim_conversation_new(GAIM_CONV_IM, account,
+		conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account,
 				session->name);
 	}
 	im = gaim_conversation_get_im_data(conv);
@@ -272,10 +272,10 @@
 		session->peer_port = args->peer_port;
 		snprintf(buf, BUFSIZ, "%s%s", CRAZYCHAT_ACCEPT_CODE,
 			gaim_network_get_my_ip(-1));
-		conv = gaim_find_conversation_with_account(GAIM_CONV_ANY, args->name,
+		conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, args->name,
 				args->account);
 		if (!conv) {
-			conv = gaim_conversation_new(GAIM_CONV_IM,
+			conv = gaim_conversation_new(GAIM_CONV_TYPE_IM,
 				args->account, args->name);
 		}
 		im = gaim_conversation_get_im_data(conv);