pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16306] trunk/src/protocols/yahoo

[<the...@us...>]

Revision: 16306
Author:   thekingant
Date:     2006-06-21 23:26:38 -0700 (Wed, 21 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16306&view=rev

Log Message:
-----------
Keep track of the Yahoo! IMVironment specified by the people we're
IMing with.  When we reply to their IMs, we now send the same IMVironment
instead of always sending an empty IMVironment because sending an
empty IMVironment would reset their IMVironment back to nothing.

This shouldn't negatively affect the Doodle stuff... but it didn't
work for me when I tested it, so it's hard to tell.

This is a change I made while at Meebo

Modified Paths:
--------------
    trunk/src/protocols/yahoo/yahoo.c
    trunk/src/protocols/yahoo/yahoo.h
    trunk/src/protocols/yahoo/yahoo_filexfer.c
Modified: trunk/src/protocols/yahoo/yahoo.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo.c	2006-06-22 06:00:25 UTC (rev 16305)
+++ trunk/src/protocols/yahoo/yahoo.c	2006-06-22 06:26:38 UTC (rev 16306)
@@ -670,6 +670,7 @@
 
 static void yahoo_process_message(GaimConnection *gc, struct yahoo_packet *pkt)
 {
+	struct yahoo_data *yd = gc->proto_data;
 	GSList *l = pkt->hash;
 	GSList *list = NULL;
 	struct _yahoo_im *im = NULL;
@@ -712,24 +713,29 @@
 
 	/** TODO: It seems that this check should be per IM, not global */
 	/* Check for the Doodle IMV */
-	if(im != NULL && imv != NULL && !strcmp(imv, "doodle;11"))
+	if (im != NULL && imv!= NULL && im->from != NULL)
 	{
-		GaimWhiteboard *wb;
+		g_hash_table_replace(yd->imvironments, g_strdup(im->from), g_strdup(imv));
 
-		if (!yahoo_privacy_check(gc, im->from)) {
-			gaim_debug_info("yahoo", "Doodle request from %s dropped.\n", im->from);
-			return;
-		}
+		if (strcmp(imv, "doodle;11") == 0)
+		{
+			GaimWhiteboard *wb;
 
-		wb = gaim_whiteboard_get_session(gc->account, im->from);
+			if (!yahoo_privacy_check(gc, im->from)) {
+				gaim_debug_info("yahoo", "Doodle request from %s dropped.\n", im->from);
+				return;
+			}
 
-		/* If a Doodle session doesn't exist between this user */
-		if(wb == NULL)
-		{
-			wb = gaim_whiteboard_create(gc->account, im->from, DOODLE_STATE_REQUESTED);
+			wb = gaim_whiteboard_get_session(gc->account, im->from);
 
-			yahoo_doodle_command_send_request(gc, im->from);
-			yahoo_doodle_command_send_ready(gc, im->from);
+			/* If a Doodle session doesn't exist between this user */
+			if(wb == NULL)
+			{
+				wb = gaim_whiteboard_create(gc->account, im->from, DOODLE_STATE_REQUESTED);
+
+				yahoo_doodle_command_send_request(gc, im->from);
+				yahoo_doodle_command_send_ready(gc, im->from);
+			}
 		}
 	}
 
@@ -2576,6 +2582,7 @@
 	/* TODO: Is there a good grow size for the buffer? */
 	yd->txbuf = gaim_circ_buffer_new(0);
 	yd->friends = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, yahoo_friend_free);
+	yd->imvironments = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 	yd->confs = NULL;
 	yd->conf_id = 2;
 
@@ -2628,6 +2635,7 @@
 		yahoo_c_leave(gc, 1); /* 1 = YAHOO_CHAT_ID */
 
 	g_hash_table_destroy(yd->friends);
+	g_hash_table_destroy(yd->imvironments);
 	g_free(yd->chat_name);
 
 	g_free(yd->cookie_y);
@@ -3101,14 +3109,30 @@
 		yahoo_packet_hash_str(pkt, 97, "1");
 	yahoo_packet_hash_str(pkt, 14, msg2);
 
-	/* If this message is to a user who is also Doodling with the local user,
+	/*
+	 * IMVironment.
+	 *
+	 * If this message is to a user who is also Doodling with the local user,
 	 * format the chat packet with the correct IMV information (thanks Yahoo!)
-	*/
-	wb = gaim_whiteboard_get_session(gc->account, (char*)who);
+	 *
+	 * Otherwise attempt to use the same IMVironment as the remote user,
+	 * just so that we don't inadvertantly reset their IMVironment back
+	 * to nothing.
+	 *
+	 * If they have no set an IMVironment, then use the default.
+	 */
+	wb = gaim_whiteboard_get_session(gc->account, who);
 	if (wb)
-		yahoo_packet_hash_str(pkt,   63, "doodle;11");
+		yahoo_packet_hash_str(pkt, 63, "doodle;11");
 	else
-		yahoo_packet_hash_str(pkt,   63, ";0"); /* IMvironment */
+	{
+		const char *imv;
+		imv = g_hash_table_lookup(yd->imvironments, who);
+		if (imv != NULL)
+			yahoo_packet_hash_str(pkt, 63, imv);
+		else
+			yahoo_packet_hash_str(pkt, 63, ";0");
+	}
 
 	yahoo_packet_hash_str(pkt,   64, "0"); /* no idea */
 	yahoo_packet_hash_str(pkt, 1002, "1"); /* no idea, Yahoo 6 or later only it seems */

Modified: trunk/src/protocols/yahoo/yahoo.h
===================================================================
--- trunk/src/protocols/yahoo/yahoo.h	2006-06-22 06:00:25 UTC (rev 16305)
+++ trunk/src/protocols/yahoo/yahoo.h	2006-06-22 06:26:38 UTC (rev 16306)
@@ -105,6 +105,16 @@
 	GaimCircBuffer *txbuf;
 	guint txhandler;
 	GHashTable *friends;
+
+	/**
+	 * This is used to keep track of the IMVironment chosen
+	 * by people you talk to.  We don't do very much with
+	 * this right now... but at least now if the remote user
+	 * selects an IMVironment we won't reset it back to the
+	 * default of nothing.
+	 */
+	GHashTable *imvironments;
+
 	int current_status;
 	gboolean logged_in;
 	GString *tmp_serv_blist, *tmp_serv_ilist, *tmp_serv_plist;

Modified: trunk/src/protocols/yahoo/yahoo_filexfer.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo_filexfer.c	2006-06-22 06:00:25 UTC (rev 16305)
+++ trunk/src/protocols/yahoo/yahoo_filexfer.c	2006-06-22 06:26:38 UTC (rev 16306)
@@ -481,14 +481,18 @@
 	char *to = NULL;
 	char *msg = NULL;
 	char *url = NULL;
+	char *imv = NULL;
 	long expires = 0;
 	GaimXfer *xfer;
+	struct yahoo_data *yd;
 	struct yahoo_xfer_data *xfer_data;
 	char *service = NULL;
 	char *filename = NULL;
 	unsigned long filesize = 0L;
 	GSList *l;
 
+	yd = gc->proto_data;
+
 	for (l = pkt->hash; l; l = l->next) {
 		struct yahoo_pair *pair = l->data;
 
@@ -508,8 +512,19 @@
 			filesize = atol(pair->value);
 		if (pair->key == 49)
 			service = pair->value;
+		if (pair->key == 63)
+			imv = pair->value;
 	}
 
+	/*
+	 * The remote user has changed their IMVironment.  We
+	 * record it for later use.
+	 */
+	if (from && imv && service && (strcmp("IMVIRONMENT", service) == 0)) {
+		g_hash_table_replace(yd->imvironments, g_strdup(from), g_strdup(imv));
+		return;
+	}
+
 	if (pkt->service == YAHOO_SERVICE_P2PFILEXFER) {
 		if (service && (strcmp("FILEXFER", service) != 0)) {
 			gaim_debug_misc("yahoo", "unhandled service 0x%02x\n", pkt->service);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16705] trunk/src/protocols/yahoo

[<the...@us...>]

Revision: 16705
Author:   thekingant
Date:     2006-08-11 01:08:19 -0700 (Fri, 11 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16705&view=rev

Log Message:
-----------
Don't use the same callback for both gaim_proxy_connect() and
gaim_input_add(). Aside from being a little confusing, it's
hindering some changes I want to make to gaim_proxy_connect().

Modified Paths:
--------------
    trunk/src/protocols/yahoo/yahoo.c
    trunk/src/protocols/yahoo/yahoo_filexfer.c
    trunk/src/protocols/yahoo/yahoochat.c
Modified: trunk/src/protocols/yahoo/yahoo.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo.c	2006-08-11 08:01:16 UTC (rev 16704)
+++ trunk/src/protocols/yahoo/yahoo.c	2006-08-11 08:08:19 UTC (rev 16705)
@@ -2354,19 +2354,17 @@
 	}
 }
 
-static void yahoo_got_cookies(gpointer data, gint source, GaimInputCondition cond)
+static void yahoo_got_cookies_send_cb(gpointer data, gint source, GaimInputCondition cond)
 {
-	GaimConnection *gc = data;
-	struct yahoo_data *yd = gc->proto_data;
-	int written, total_len;
+	GaimConnection *gc;
+	struct yahoo_data *yd;
+	int written, remaining;
 
-	if (source < 0) {
-		gaim_connection_error(gc, _("Unable to connect."));
-		return;
-	}
+	gc = data;
+	yd = gc->proto_data;
 
-	total_len = strlen(yd->auth) - yd->auth_written;
-	written = write(source, yd->auth + yd->auth_written, total_len);
+	remaining = strlen(yd->auth) - yd->auth_written;
+	written = write(source, yd->auth + yd->auth_written, remaining);
 
 	if (written < 0 && errno == EAGAIN)
 		written = 0;
@@ -2380,22 +2378,35 @@
 		return;
 	}
 
-	if (written < total_len) {
+	if (written < remaining) {
 		yd->auth_written += written;
-		if (!gc->inpa)
-			gc->inpa = gaim_input_add(source, GAIM_INPUT_WRITE,
-				yahoo_got_cookies, gc);
 		return;
 	}
 
 	g_free(yd->auth);
 	yd->auth = NULL;
 	yd->auth_written = 0;
-	if (gc->inpa)
-		gaim_input_remove(gc->inpa);
+	gaim_input_remove(gc->inpa);
 	gc->inpa = gaim_input_add(source, GAIM_INPUT_READ, yahoo_web_pending, gc);
 }
 
+static void yahoo_got_cookies(gpointer data, gint source, GaimInputCondition cond)
+{
+	GaimConnection *gc = data;
+
+	if (source < 0) {
+		gaim_connection_error(gc, _("Unable to connect."));
+		return;
+	}
+
+	if (gc->inpa == 0)
+	{
+		gc->inpa = gaim_input_add(source, GAIM_INPUT_WRITE,
+			yahoo_got_cookies_send_cb, gc);
+		yahoo_got_cookies_send_cb(gc, source, GAIM_INPUT_WRITE);
+	}
+}
+
 static void yahoo_login_page_hash_iter(const char *key, const char *val, GString *url)
 {
 	if (!strcmp(key, "passwd"))

Modified: trunk/src/protocols/yahoo/yahoo_filexfer.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo_filexfer.c	2006-08-11 08:01:16 UTC (rev 16704)
+++ trunk/src/protocols/yahoo/yahoo_filexfer.c	2006-08-11 08:08:19 UTC (rev 16705)
@@ -57,11 +57,45 @@
 	g_free(xd);
 }
 
+static void yahoo_receivefile_send_cb(gpointer data, gint source, GaimInputCondition condition)
+{
+	GaimXfer *xfer;
+	struct yahoo_xfer_data *xd;
+	int remaining, written;
+
+	xfer = data;
+	xd = xfer->data;
+
+	remaining = xd->txbuflen - xd->txbuf_written;
+	written = write(xfer->fd, xd->txbuf + xd->txbuf_written, remaining);
+
+	if (written < 0 && errno == EAGAIN)
+		written = 0;
+	else if (written <= 0) {
+		gaim_debug_error("yahoo", "Unable to write in order to start ft errno = %d\n", errno);
+		gaim_xfer_cancel_remote(xfer);
+		return;
+	}
+
+	if (written < remaining) {
+		xd->txbuf_written += written;
+		return;
+	}
+
+	gaim_input_remove(xd->tx_handler);
+	xd->tx_handler = 0;
+	g_free(xd->txbuf);
+	xd->txbuf = NULL;
+	xd->txbuflen = 0;
+
+	gaim_xfer_start(xfer, source, NULL, 0);
+
+}
+
 static void yahoo_receivefile_connected(gpointer data, gint source, GaimInputCondition condition)
 {
 	GaimXfer *xfer;
 	struct yahoo_xfer_data *xd;
-	int total_len, written;
 
 	gaim_debug(GAIM_DEBUG_INFO, "yahoo",
 			   "AAA - in yahoo_receivefile_connected\n");
@@ -76,6 +110,8 @@
 		return;
 	}
 
+	xfer->fd = source;
+
 	/* The first time we get here, assemble the tx buffer */
 	if (xd->txbuflen == 0) {
 		xd->txbuf = g_strdup_printf("GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n",
@@ -84,12 +120,26 @@
 		xd->txbuf_written = 0;
 	}
 
-	total_len = xd->txbuflen - xd->txbuf_written;
+	if (!xd->tx_handler)
+	{
+		xd->tx_handler = gaim_input_add(source, GAIM_INPUT_WRITE,
+			yahoo_receivefile_send_cb, xfer);
+		yahoo_receivefile_send_cb(xfer, source, GAIM_INPUT_WRITE);
+	}
+}
 
-	xfer->fd = source;
+static void yahoo_sendfile_send_cb(gpointer data, gint source, GaimInputCondition condition)
+{
+	GaimXfer *xfer;
+	struct yahoo_xfer_data *xd;
+	int written, remaining;
 
-	written = write(xfer->fd, xd->txbuf + xd->txbuf_written, total_len);
+	xfer = data;
+	xd = xfer->data;
 
+	remaining = xd->txbuflen - xd->txbuf_written;
+	written = write(xfer->fd, xd->txbuf + xd->txbuf_written, remaining);
+
 	if (written < 0 && errno == EAGAIN)
 		written = 0;
 	else if (written <= 0) {
@@ -98,31 +148,33 @@
 		return;
 	}
 
-	if (written < total_len) {
-		if (!xd->tx_handler)
-			xd->tx_handler = gaim_input_add(source, GAIM_INPUT_WRITE,
-				yahoo_receivefile_connected, xfer);
+	if (written < remaining) {
 		xd->txbuf_written += written;
 		return;
 	}
 
-	if (xd->tx_handler)
-		gaim_input_remove(xd->tx_handler);
+	gaim_input_remove(xd->tx_handler);
 	xd->tx_handler = 0;
 	g_free(xd->txbuf);
 	xd->txbuf = NULL;
 	xd->txbuflen = 0;
 
 	gaim_xfer_start(xfer, source, NULL, 0);
-
 }
 
-
 static void yahoo_sendfile_connected(gpointer data, gint source, GaimInputCondition condition)
 {
 	GaimXfer *xfer;
 	struct yahoo_xfer_data *xd;
-	int written, total_len;
+	struct yahoo_packet *pkt;
+	gchar *size, *filename, *encoded_filename, *header;
+	guchar *pkt_buf;
+	const char *host;
+	int port;
+	size_t content_length, header_len, pkt_buf_len;
+	GaimConnection *gc;
+	GaimAccount *account;
+	struct yahoo_data *yd;
 
 	gaim_debug(GAIM_DEBUG_INFO, "yahoo",
 			   "AAA - in yahoo_sendfile_connected\n");
@@ -131,7 +183,6 @@
 	if (!(xd = xfer->data))
 		return;
 
-
 	if (source < 0) {
 		gaim_xfer_error(GAIM_XFER_RECEIVE, gaim_xfer_get_account(xfer),
 				xfer->who, _("Unable to connect."));
@@ -139,96 +190,61 @@
 		return;
 	}
 
-	/* The first time we get here, assemble the tx buffer */
-	if (xd->txbuflen == 0) {
-		struct yahoo_packet *pkt;
-		gchar *size, *filename, *encoded_filename, *header;
-		guchar *pkt_buf;
-		const char *host;
-		int port;
-		size_t content_length, header_len, pkt_buf_len;
-		GaimConnection *gc;
-		GaimAccount *account;
-		struct yahoo_data *yd;
+	xfer->fd = source;
 
-		gc = xd->gc;
-		account = gaim_connection_get_account(gc);
-		yd = gc->proto_data;
+	/* Assemble the tx buffer */
+	gc = xd->gc;
+	account = gaim_connection_get_account(gc);
+	yd = gc->proto_data;
 
-		pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANSFER,
-			YAHOO_STATUS_AVAILABLE, yd->session_id);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANSFER,
+		YAHOO_STATUS_AVAILABLE, yd->session_id);
 
-		size = g_strdup_printf("%" G_GSIZE_FORMAT, gaim_xfer_get_size(xfer));
-		filename = g_path_get_basename(gaim_xfer_get_local_filename(xfer));
-		encoded_filename = yahoo_string_encode(gc, filename, NULL);
+	size = g_strdup_printf("%" G_GSIZE_FORMAT, gaim_xfer_get_size(xfer));
+	filename = g_path_get_basename(gaim_xfer_get_local_filename(xfer));
+	encoded_filename = yahoo_string_encode(gc, filename, NULL);
 
-		yahoo_packet_hash(pkt, "sssss", 0, gaim_connection_get_display_name(gc),
-			  5, xfer->who, 14, "", 27, encoded_filename, 28, size);
-		g_free(size);
-		g_free(encoded_filename);
-		g_free(filename);
+	yahoo_packet_hash(pkt, "sssss", 0, gaim_connection_get_display_name(gc),
+	  5, xfer->who, 14, "", 27, encoded_filename, 28, size);
+	g_free(size);
+	g_free(encoded_filename);
+	g_free(filename);
 
-		content_length = YAHOO_PACKET_HDRLEN + yahoo_packet_length(pkt);
+	content_length = YAHOO_PACKET_HDRLEN + yahoo_packet_length(pkt);
 
-		pkt_buf_len = yahoo_packet_build(pkt, 8, FALSE, &pkt_buf);
-		yahoo_packet_free(pkt);
+	pkt_buf_len = yahoo_packet_build(pkt, 8, FALSE, &pkt_buf);
+	yahoo_packet_free(pkt);
 
-		host = gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST);
-		port = gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT);
-		header = g_strdup_printf(
-			"POST http://%s:%d/notifyft HTTP/1.0\r\n"
-			"Content-length: %" G_GSIZE_FORMAT "\r\n"
-			"Host: %s:%d\r\n"
-			"Cookie: Y=%s; T=%s\r\n"
-			"\r\n",
-			host, port, content_length + 4 + gaim_xfer_get_size(xfer),
-			host, port, yd->cookie_y, yd->cookie_t);
+	host = gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST);
+	port = gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT);
+	header = g_strdup_printf(
+		"POST http://%s:%d/notifyft HTTP/1.0\r\n"
+		"Content-length: %" G_GSIZE_FORMAT "\r\n"
+		"Host: %s:%d\r\n"
+		"Cookie: Y=%s; T=%s\r\n"
+		"\r\n",
+		host, port, content_length + 4 + gaim_xfer_get_size(xfer),
+		host, port, yd->cookie_y, yd->cookie_t);
 
+	header_len = strlen(header);
 
-		header_len = strlen(header);
+	xd->txbuflen = header_len + pkt_buf_len + 4;
+	xd->txbuf = g_malloc(xd->txbuflen);
 
-		xd->txbuflen = header_len + pkt_buf_len + 4;
-		xd->txbuf = g_malloc(xd->txbuflen);
+	memcpy(xd->txbuf, header, header_len);
+	g_free(header);
+	memcpy(xd->txbuf + header_len, pkt_buf, pkt_buf_len);
+	g_free(pkt_buf);
+	memcpy(xd->txbuf + header_len + pkt_buf_len, "29\xc0\x80", 4);
 
-		memcpy(xd->txbuf, header, header_len);
-		g_free(header);
-		memcpy(xd->txbuf + header_len, pkt_buf, pkt_buf_len);
-		g_free(pkt_buf);
-		memcpy(xd->txbuf + header_len + pkt_buf_len, "29\xc0\x80", 4);
+	xd->txbuf_written = 0;
 
-		xd->txbuf_written = 0;
+	if (xd->tx_handler == 0)
+	{
+		xd->tx_handler = gaim_input_add(source, GAIM_INPUT_WRITE,
+										yahoo_sendfile_send_cb, xfer);
+		yahoo_sendfile_send_cb(xfer, source, GAIM_INPUT_WRITE);
 	}
-
-	total_len = xd->txbuflen - xd->txbuf_written;
-
-	xfer->fd = source;
-
-	written = write(xfer->fd, xd->txbuf + xd->txbuf_written, total_len);
-
-	if (written < 0 && errno == EAGAIN)
-		written = 0;
-	else if (written <= 0) {
-		gaim_debug_error("yahoo", "Unable to write in order to start ft errno = %d\n", errno);
-		gaim_xfer_cancel_remote(xfer);
-		return;
-	}
-
-	if (written < total_len) {
-		if (!xd->tx_handler)
-			xd->tx_handler = gaim_input_add(source, GAIM_INPUT_WRITE,
-				yahoo_sendfile_connected, xfer);
-		xd->txbuf_written += written;
-		return;
-	}
-
-	if (xd->tx_handler)
-		gaim_input_remove(xd->tx_handler);
-	xd->tx_handler = 0;
-	g_free(xd->txbuf);
-	xd->txbuf = NULL;
-	xd->txbuflen = 0;
-
-	gaim_xfer_start(xfer, source, NULL, 0);
 }
 
 static void yahoo_xfer_init(GaimXfer *xfer)

Modified: trunk/src/protocols/yahoo/yahoochat.c
===================================================================
--- trunk/src/protocols/yahoo/yahoochat.c	2006-08-11 08:01:16 UTC (rev 16704)
+++ trunk/src/protocols/yahoo/yahoochat.c	2006-08-11 08:08:19 UTC (rev 16705)
@@ -1335,38 +1335,22 @@
 	yrl->rxlen = 0;
 }
 
-static void yahoo_roomlist_got_connected(gpointer data, gint source, GaimInputCondition cond)
+static void yahoo_roomlist_send_cb(gpointer data, gint source, GaimInputCondition cond)
 {
-	struct yahoo_roomlist *yrl = data;
-	GaimRoomlist *list = yrl->list;
-	struct yahoo_data *yd = gaim_account_get_connection(list->account)->proto_data;
-	int written, total_len;
+	struct yahoo_roomlist *yrl;
+	GaimRoomlist *list;
+	int written, remaining;
 
-	if (source < 0) {
-		gaim_notify_error(gaim_account_get_connection(list->account), NULL, _("Unable to connect"), _("Fetching the room list failed."));
-		yahoo_roomlist_cleanup(list, yrl);
-		return;
-	}
+	yrl = data;
+	list = yrl->list;
 
-	if (yrl->txbuf == NULL) {
-		yrl->fd = source;
+	remaining = strlen(yrl->txbuf) - yrl->tx_written;
+	written = write(yrl->fd, yrl->txbuf + yrl->tx_written, remaining);
 
-		yrl->txbuf = g_strdup_printf(
-			"GET http://%s/%s HTTP/1.0\r\n"
-			"Host: %s\r\n"
-			"Cookie: Y=%s; T=%s\r\n\r\n",
-			yrl->host, yrl->path, yrl->host, yd->cookie_y,
-			yd->cookie_t);
-	}
-
-	total_len = strlen(yrl->txbuf) - yrl->tx_written;
-	written = write(yrl->fd, yrl->txbuf + yrl->tx_written, total_len);
-
 	if (written < 0 && errno == EAGAIN)
 		written = 0;
 	else if (written <= 0) {
-		if (yrl->inpa)
-			gaim_input_remove(yrl->inpa);
+		gaim_input_remove(yrl->inpa);
 		yrl->inpa = 0;
 		g_free(yrl->txbuf);
 		yrl->txbuf = NULL;
@@ -1375,24 +1359,47 @@
 		return;
 	}
 
-	if (written < total_len) {
-		if (!yrl->inpa)
-			yrl->inpa = gaim_input_add(yrl->fd,
-				GAIM_INPUT_WRITE, yahoo_roomlist_got_connected,
-				yrl);
+	if (written < remaining) {
 		yrl->tx_written += written;
 		return;
 	}
 
 	g_free(yrl->txbuf);
 	yrl->txbuf = NULL;
-	if (yrl->inpa)
-		gaim_input_remove(yrl->inpa);
+
+	gaim_input_remove(yrl->inpa);
 	yrl->inpa = gaim_input_add(yrl->fd, GAIM_INPUT_READ,
-		yahoo_roomlist_pending, yrl);
+							   yahoo_roomlist_pending, yrl);
 
 }
 
+static void yahoo_roomlist_got_connected(gpointer data, gint source, GaimInputCondition cond)
+{
+	struct yahoo_roomlist *yrl = data;
+	GaimRoomlist *list = yrl->list;
+	struct yahoo_data *yd = gaim_account_get_connection(list->account)->proto_data;
+
+	if (source < 0) {
+		gaim_notify_error(gaim_account_get_connection(list->account), NULL, _("Unable to connect"), _("Fetching the room list failed."));
+		yahoo_roomlist_cleanup(list, yrl);
+		return;
+	}
+
+	yrl->fd = source;
+
+	yrl->txbuf = g_strdup_printf(
+		"GET http://%s/%s HTTP/1.0\r\n"
+		"Host: %s\r\n"
+		"Cookie: Y=%s; T=%s\r\n\r\n",
+		yrl->host, yrl->path, yrl->host, yd->cookie_y,
+		yd->cookie_t);
+
+
+	yrl->inpa = gaim_input_add(yrl->fd, GAIM_INPUT_WRITE,
+							   yahoo_roomlist_send_cb, yrl);
+	yahoo_roomlist_send_cb(yrl, yrl->fd, GAIM_INPUT_WRITE);
+}
+
 GaimRoomlist *yahoo_roomlist_get_list(GaimConnection *gc)
 {
 	struct yahoo_roomlist *yrl;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16754] trunk/src/protocols/yahoo

[<the...@us...>]

Revision: 16754
Author:   thekingant
Date:     2006-08-14 01:27:53 -0700 (Mon, 14 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16754&view=rev

Log Message:
-----------
Warning fixes for now.  Someone (probably me, sigh) will have
to change this to use gaim_proxy_connect_cancel() later in
the week

Modified Paths:
--------------
    trunk/src/protocols/yahoo/yahoo.c
    trunk/src/protocols/yahoo/yahoo_filexfer.c
    trunk/src/protocols/yahoo/yahoo_picture.c
    trunk/src/protocols/yahoo/yahoochat.c
    trunk/src/protocols/yahoo/ycht.c
Modified: trunk/src/protocols/yahoo/yahoo.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo.c	2006-08-14 08:24:30 UTC (rev 16753)
+++ trunk/src/protocols/yahoo/yahoo.c	2006-08-14 08:27:53 UTC (rev 16754)
@@ -2239,7 +2239,7 @@
 	}
 }
 
-static void yahoo_got_connected(gpointer data, gint source)
+static void yahoo_got_connected(gpointer data, gint source, const gchar *error_message)
 {
 	GaimConnection *gc = data;
 	struct yahoo_data *yd;
@@ -2266,7 +2266,7 @@
 	gc->inpa = gaim_input_add(yd->fd, GAIM_INPUT_READ, yahoo_pending, gc);
 }
 
-static void yahoo_got_web_connected(gpointer data, gint source)
+static void yahoo_got_web_connected(gpointer data, gint source, const gchar *error_message)
 {
 	GaimConnection *gc = data;
 	struct yahoo_data *yd;
@@ -2390,7 +2390,7 @@
 	gc->inpa = gaim_input_add(source, GAIM_INPUT_READ, yahoo_web_pending, gc);
 }
 
-static void yahoo_got_cookies(gpointer data, gint source)
+static void yahoo_got_cookies(gpointer data, gint source, const gchar *error_message)
 {
 	GaimConnection *gc = data;
 

Modified: trunk/src/protocols/yahoo/yahoo_filexfer.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo_filexfer.c	2006-08-14 08:24:30 UTC (rev 16753)
+++ trunk/src/protocols/yahoo/yahoo_filexfer.c	2006-08-14 08:27:53 UTC (rev 16754)
@@ -92,7 +92,7 @@
 
 }
 
-static void yahoo_receivefile_connected(gpointer data, gint source)
+static void yahoo_receivefile_connected(gpointer data, gint source, const gchar *error_message)
 {
 	GaimXfer *xfer;
 	struct yahoo_xfer_data *xd;
@@ -162,7 +162,7 @@
 	gaim_xfer_start(xfer, source, NULL, 0);
 }
 
-static void yahoo_sendfile_connected(gpointer data, gint source)
+static void yahoo_sendfile_connected(gpointer data, gint source, const gchar *error_message)
 {
 	GaimXfer *xfer;
 	struct yahoo_xfer_data *xd;

Modified: trunk/src/protocols/yahoo/yahoo_picture.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo_picture.c	2006-08-14 08:24:30 UTC (rev 16753)
+++ trunk/src/protocols/yahoo/yahoo_picture.c	2006-08-14 08:27:53 UTC (rev 16754)
@@ -406,7 +406,7 @@
 	}
 }
 
-static void yahoo_buddy_icon_upload_connected(gpointer data, gint source)
+static void yahoo_buddy_icon_upload_connected(gpointer data, gint source, const gchar *error_message)
 {
 	struct yahoo_buddy_icon_upload_data *d = data;
 	struct yahoo_packet *pkt;

Modified: trunk/src/protocols/yahoo/yahoochat.c
===================================================================
--- trunk/src/protocols/yahoo/yahoochat.c	2006-08-14 08:24:30 UTC (rev 16753)
+++ trunk/src/protocols/yahoo/yahoochat.c	2006-08-14 08:27:53 UTC (rev 16754)
@@ -1373,7 +1373,7 @@
 
 }
 
-static void yahoo_roomlist_got_connected(gpointer data, gint source)
+static void yahoo_roomlist_got_connected(gpointer data, gint source, const gchar *error_message)
 {
 	struct yahoo_roomlist *yrl = data;
 	GaimRoomlist *list = yrl->list;

Modified: trunk/src/protocols/yahoo/ycht.c
===================================================================
--- trunk/src/protocols/yahoo/ycht.c	2006-08-14 08:24:30 UTC (rev 16753)
+++ trunk/src/protocols/yahoo/ycht.c	2006-08-14 08:27:53 UTC (rev 16754)
@@ -528,7 +528,7 @@
 	}
 }
 
-static void ycht_got_connected(gpointer data, gint source)
+static void ycht_got_connected(gpointer data, gint source, const gchar *error_message)
 {
 	YchtConn *ycht = data;
 	GaimConnection *gc = ycht->gc;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.