diff libpurple/protocols/yahoo/yahoo.c @ 22017:97d530d11cc0

Revert patch that added receive-only transfer support for Yahoo protocol version 15. Done to make way for applying another Yahoo file transfer patch. Refs #708. Refs #4533.
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 06 Jan 2008 19:28:49 +0000
parents ffbd2e3e10e4
children 118046227581
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo.c	Sun Jan 06 19:02:57 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Sun Jan 06 19:28:49 2008 +0000
@@ -493,14 +493,13 @@
 static void yahoo_process_cookie(struct yahoo_data *yd, char *c)
 {
 	if (c[0] == 'Y') {
-		g_free(yd->cookie_y);
+		if (yd->cookie_y)
+			g_free(yd->cookie_y);
 		yd->cookie_y = _getcookie(c);
 	} else if (c[0] == 'T') {
-		g_free(yd->cookie_t);
+		if (yd->cookie_t)
+			g_free(yd->cookie_t);
 		yd->cookie_t = _getcookie(c);
-	} else if (c[0] == 'C') {
-		g_free(yd->cookie_c);
-		yd->cookie_c = _getcookie(c);
 	} else
 		purple_debug_info("yahoo", "Ignoring unrecognized cookie '%c'\n", c[0]);
 }
@@ -2434,12 +2433,6 @@
 	case YAHOO_SERVICE_AUDIBLE:
 		yahoo_process_audible(gc, pkt);
 		break;
-	case YAHOO_SERVICE_Y7_FILETRANSFER:
-		yahoo_process_y7_filetransfer(gc, pkt);
-		break;
-	case YAHOO_SERVICE_Y7_FILETRANSFER_INFO:
-		yahoo_process_y7_filetransfer_info(gc, pkt);
-		break;
 	default:
 		purple_debug(PURPLE_DEBUG_ERROR, "yahoo",
 				   "Unhandled service 0x%02x\n", pkt->service);
@@ -3019,7 +3012,6 @@
 
 	g_free(yd->cookie_y);
 	g_free(yd->cookie_t);
-	g_free(yd->cookie_c);
 
 	if (yd->txhandler)
 		purple_input_remove(yd->txhandler);