diff src/protocols/toc/toc.c @ 7118:bf630f7dfdcd

[gaim-migrate @ 7685] Here's a commit that I think will make faceprint happy. GaimWindow -> GaimConvWindow, GaimIm -> GaimConvIm, GaimChat -> GaimConvChat, GaimBlistChat -> GaimChat, and updated the API functions as well. Plugin authors are going to hunt me down and murder me. I can feel it.. committer: Tailor Script <[e-mail]>

--- a/src/protocols/toc/toc.c	Thu Oct 02 02:15:36 2003 +0000
+++ b/src/protocols/toc/toc.c	Thu Oct 02 02:54:07 2003 +0000
@@ -735,7 +735,7 @@
 			message++;
 		message++;
 
-		a = (away && (*away == 'T')) ? GAIM_IM_AUTO_RESP : 0;
+		a = (away && (*away == 'T')) ? GAIM_CONV_IM_AUTO_RESP : 0;
 
 		serv_got_im(gc, c, message, a, time(NULL));
 	} else if (!g_ascii_strcasecmp(c, "UPDATE_BUDDY")) {
@@ -823,16 +823,16 @@
 		char *in, *buddy;
 		GSList *bcs = gc->buddy_chats;
 		GaimConversation *b = NULL;
-		GaimChat *chat;
+		GaimConvChat *chat;
 
 		sscanf(strtok(NULL, ":"), "%d", &id);
 		in = strtok(NULL, ":");
 
-		chat = GAIM_CHAT(b);
+		chat = GAIM_CONV_CHAT(b);
 
 		while (bcs) {
 			b = (GaimConversation *)bcs->data;
-			if (id == gaim_chat_get_id(chat))
+			if (id == gaim_conv_chat_get_id(chat))
 				break;
 			bcs = bcs->next;
 			b = NULL;
@@ -843,10 +843,10 @@
 
 		if (in && (*in == 'T'))
 			while ((buddy = strtok(NULL, ":")) != NULL)
-				gaim_chat_add_user(chat, buddy, NULL);
+				gaim_conv_chat_add_user(chat, buddy, NULL);
 		else
 			while ((buddy = strtok(NULL, ":")) != NULL)
-				gaim_chat_remove_user(chat, buddy, NULL);
+				gaim_conv_chat_remove_user(chat, buddy, NULL);
 	} else if (!g_ascii_strcasecmp(c, "CHAT_INVITE")) {
 		char *name, *who, *message;
 		int id;
@@ -870,7 +870,7 @@
 
 		while (bcs) {
 			b = (GaimConversation *)bcs->data;
-			if (id == gaim_chat_get_id(GAIM_CHAT(b)))
+			if (id == gaim_conv_chat_get_id(GAIM_CONV_CHAT(b)))
 				break;
 			b = NULL;
 			bcs = bcs->next;
@@ -1056,7 +1056,7 @@
 	}
 }
 
-static int toc_send_im(GaimConnection *gc, const char *name, const char *message, GaimImFlags flags)
+static int toc_send_im(GaimConnection *gc, const char *name, const char *message, GaimConvImFlags flags)
 {
 	char *buf1, *buf2;
 
@@ -1068,7 +1068,7 @@
 		return -E2BIG;
 	}
 	buf2 = g_strdup_printf("toc_send_im %s \"%s\"%s", gaim_normalize(name), buf1, 
-						   ((flags & GAIM_IM_AUTO_RESP) ? " auto" : ""));
+						   ((flags & GAIM_CONV_IM_AUTO_RESP) ? " auto" : ""));
 	g_free(buf1);
 #else
 	/* This doesn't work yet.  See the comments below for details */
@@ -1092,7 +1092,7 @@
 	}
 
 	buf2 = g_strdup_printf("toc2_send_im_enc %s F U en \"%s\" %s", gaim_normalize(name), buf1, 
-						   ((flags & GAIM_IM_AUTO_RESP) ? "auto" : ""));
+						   ((flags & GAIM_CONV_IM_AUTO_RESP) ? "auto" : ""));
 	g_free(buf1);
 #endif
 
@@ -1305,7 +1305,7 @@
 
 	while (bcs) {
 		b = (GaimConversation *)bcs->data;
-		if (id == gaim_chat_get_id(GAIM_CHAT(b)))
+		if (id == gaim_conv_chat_get_id(GAIM_CONV_CHAT(b)))
 			break;
 		b = NULL;
 		bcs = bcs->next;