# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1003870585 0
# Node ID 2dd86a1af92ba13d2a6faef9f05b4e8d70cbac19
# Parent  4e149a0b9665abb4444c004c3810fc68c76ff152
[gaim-migrate @ 2603]
hi.

committer: Tailor Script <tailor@pidgin.im>

diff -r 4e149a0b9665 -r 2dd86a1af92b src/list.c
--- a/src/list.c	Tue Oct 23 20:29:42 2001 +0000
+++ b/src/list.c	Tue Oct 23 20:56:25 2001 +0000
@@ -634,8 +634,7 @@
 
 	file = gaim_user_dir();
 	if (file != (char *)NULL) {
-		g_snprintf(path, sizeof path, "%s/%s.%d.blist", file, g_screenname,
-			   (gc->protocol == PROTO_OSCAR) ? PROTO_TOC : gc->protocol);
+		g_snprintf(path, sizeof path, "%s/%s.%d.blist", file, g_screenname, gc->protocol);
 		if (!stat(path, &sbuf)) {
 			debug_printf("%s exists.\n", path);
 			ret = TRUE;
@@ -675,8 +674,7 @@
 
 		file = gaim_user_dir();
 		if (file != (char *)NULL) {
-			sprintf(path, "%s/%s.%d.blist", file, g_screenname,
-				(gc->protocol == PROTO_OSCAR) ? PROTO_TOC : gc->protocol);
+			sprintf(path, "%s/%s.%d.blist", file, g_screenname, gc->protocol);
 			g_free(file);
 			g_free(g_screenname);
 		} else {
@@ -763,8 +761,7 @@
 
 	g_screenname = get_screenname_filename(g->username);
 
-	sprintf(path, "%s/%s.%d.blist", file, g_screenname,
-		(g->protocol == PROTO_OSCAR) ? PROTO_TOC : g->protocol);
+	sprintf(path, "%s/%s.%d.blist", file, g_screenname, g->protocol);
 	if ((f = fopen(path, "w"))) {
 		debug_printf("writing %s\n", path);
 		toc_build_config(g, buf, 8192 - 1, TRUE);
diff -r 4e149a0b9665 -r 2dd86a1af92b src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Tue Oct 23 20:29:42 2001 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Oct 23 20:56:25 2001 +0000
@@ -179,7 +179,6 @@
 static struct chat_connection *find_oscar_chat(struct gaim_connection *gc, int id) {
 	GSList *g = ((struct oscar_data *)gc->proto_data)->oscar_chats;
 	struct chat_connection *c = NULL;
-	if (gc->protocol != PROTO_OSCAR) return NULL;
 
 	while (g) {
 		c = (struct chat_connection *)g->data;
@@ -445,7 +444,8 @@
 		odata->icq = TRUE;
 		/* this is odd but it's necessary for a proper do_import and do_export */
 		gc->protocol = PROTO_ICQ;
-	}
+	} else
+		gc->protocol = PROTO_TOC;
 
 	sess = g_new0(aim_session_t, 1);
 
@@ -488,7 +488,6 @@
 
 static void oscar_close(struct gaim_connection *gc) {
 	struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
-	if (gc->protocol != PROTO_OSCAR) return;
 	
 	while (odata->oscar_chats) {
 		struct chat_connection *n = odata->oscar_chats->data;