Mercurial > pidgin

changeset 11801:81806e9241be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 14092] Cleanups, mostly // -> /* */ and moved g_print's to gaim_debug_info, and a few c99ism fixes.. committer: Tailor Script <tailor@pidgin.im>
author Gary Kramlich <grim@reaperworld.com>
date Mon, 24 Oct 2005 21:48:21 +0000
parents 32bac0647037
children 2e3a6dcebaf3
files src/protocols/yahoo/yahoo.c src/protocols/yahoo/yahoo_doodle.c src/protocols/yahoo/yahoo_doodle.h src/protocols/yahoo/yahoo_filexfer.c
diffstat 4 files changed, 287 insertions(+), 314 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo.c	Mon Oct 24 20:56:12 2005 +0000
+++ b/src/protocols/yahoo/yahoo.c	Mon Oct 24 21:48:21 2005 +0000
@@ -694,7 +694,7 @@
 				if (im)
 					im->msg = pair->value;
 			}
-			// IMV key
+			/* IMV key */
 			if (pair->key == 63)
 			{
 				strcpy( imv, pair->value );
@@ -706,23 +706,21 @@
 		                  _("Your Yahoo! message did not get sent."), NULL);
 	}
 
-	// Check for the Doodle IMV
+	/* Check for the Doodle IMV */
 	if( !strcmp( imv, "doodle;11" ) )
 	{
+		GaimWhiteboard *wb;
+
 		if (!yahoo_privacy_check(gc, im->from)) {
 			gaim_debug_info("yahoo", "Doodle request from %s dropped.\n", im->from);
 			return;
 		}
-		GaimWhiteboard *wb;
-
-		g_print( "'doodle;11' found in chat packet\n" );
 
 		wb = gaim_whiteboard_get_session( gc->account, im->from );
 
-		// If a Doodle session doesn't exist between this user
+		/* If a Doodle session doesn't exist between this user */
 		if( wb == NULL )
 		{
-			g_print( "Creating new whiteboard for chat packet request\n" );
 			wb = gaim_whiteboard_create( gc->account, im->from, DOODLE_STATE_REQUESTED );
 
 			yahoo_doodle_command_send_request( gc, im->from );
@@ -3014,7 +3012,7 @@
 	if (wb)
 		yahoo_packet_hash_str(pkt,   63, "doodle;11");
 	else
-		yahoo_packet_hash_str(pkt,   63, ";0"); // IMvironment
+		yahoo_packet_hash_str(pkt,   63, ";0"); /* IMvironment */
 
 	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 */
--- a/src/protocols/yahoo/yahoo_doodle.c	Mon Oct 24 20:56:12 2005 +0000
+++ b/src/protocols/yahoo/yahoo_doodle.c	Mon Oct 24 21:48:21 2005 +0000
@@ -21,8 +21,9 @@
  *
  */
 
-// INCLUDES ============================================================================================
-
+/******************************************************************************
+ * INCLUDES
+ *****************************************************************************/
 #include "internal.h"
 
 #include "account.h"
@@ -52,9 +53,10 @@
 #include "whiteboard.h"
 #include "yahoo_doodle.h"
 
-// GLOBALS =============================================================================================
-
-const int DefaultColorRGB24[]	=
+/******************************************************************************
+ * Globals
+ *****************************************************************************/
+const int DefaultColorRGB24[] =
 {
 	DOODLE_COLOR_RED,
 	DOODLE_COLOR_ORANGE,
@@ -71,8 +73,9 @@
 	DOODLE_COLOR_WHITE
 };
 
-// FUNCTIONS ============================================================================================
-
+/******************************************************************************
+ * Functions
+ *****************************************************************************/
 GaimCmdRet yahoo_doodle_gaim_cmd_start( GaimConversation *conv, const char *cmd, char **args, char **error, void *data )
 {
 	GaimAccount *account;
@@ -81,27 +84,27 @@
 
 	if( *args && args[0] )
 		return( GAIM_CMD_RET_FAILED );
-	
+
 	account	= gaim_conversation_get_account( conv );
 	gc		= gaim_account_get_connection( account );
 	name	= gaim_conversation_get_name(conv);
 	yahoo_doodle_initiate(gc, name);
 
-	// Write a local message to this conversation showing that
-	// a request for a Doodle session has been made
+	/* Write a local message to this conversation showing that a request for a
+	 * Doodle session has been made
+	 */
 	gaim_conv_im_write( GAIM_CONV_IM( conv ), "", _("Sent Doodle request."),
 			    GAIM_MESSAGE_NICK | GAIM_MESSAGE_RECV, time( NULL ) );
-	
+
 	return( GAIM_CMD_RET_OK );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_initiate(GaimConnection *gc, const char *name)
 {
 	GaimAccount *account;
 	char *to;
 	GaimWhiteboard *wb;
+
 	g_return_if_fail(gc);
 	g_return_if_fail(name);
 
@@ -111,54 +114,57 @@
 
 	if( wb == NULL )
 	{
-		// Insert this 'session' in the list.  At this point, it's only a requested session.	
+		/* Insert this 'session' in the list.  At this point, it's only a
+		 * requested session.
+		 */
 		wb = gaim_whiteboard_create( account, to, DOODLE_STATE_REQUESTING );
 	}
-	//else
-	//	; // NOTE Perhaps some careful handling of remote assumed established sessions
-	
+	/*
+	else
+		;
+	 */
+	/* NOTE Perhaps some careful handling of remote assumed established
+	 * sessions
+	 */
+
 	yahoo_doodle_command_send_request( gc, to );
 	yahoo_doodle_command_send_ready( gc, to );
 
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_process( GaimConnection *gc, char *me, char *from, char *command, char *message )
 {
-//	g_print( "-----------------------------------------------\n" );
-//	g_print( "%s : %s : %s -> %s\n", from, imv, command, message );
-	
-	// Now check to see what sort of Doodle message it is
-	int cmd = atoi( command );
+	if(!command)
+		return;
 
-	switch( cmd )
+	/* Now check to see what sort of Doodle message it is */
+	switch(atoi(command))
 	{
 		case DOODLE_CMD_REQUEST:
 		{
 			yahoo_doodle_command_got_request( gc, from );
 		} break;
-		
+
 		case DOODLE_CMD_READY:
 		{
 			yahoo_doodle_command_got_ready( gc, from );
 		} break;
-		
+
 		case DOODLE_CMD_CLEAR:
 		{
 			yahoo_doodle_command_got_clear( gc, from );
 		} break;
-		
+
 		case DOODLE_CMD_DRAW:
 		{
 			yahoo_doodle_command_got_draw( gc, from, message );
 		} break;
-		
+
 		case DOODLE_CMD_EXTRA:
 		{
 			yahoo_doodle_command_got_extra( gc, from, message );
 		} break;
-		
+
 		case DOODLE_CMD_CONFIRM:
 		{
 			yahoo_doodle_command_got_confirm( gc, from );
@@ -166,90 +172,89 @@
 	}
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_got_request( GaimConnection *gc, char *from )
-{	
+{
 	GaimAccount *account;
 	GaimWhiteboard *wb;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Got REQUEST (%s)\n", from );
-	
+	gaim_debug_info("yahoo", "doodle: Got Request (%s)\n", from);
+
 	account	= gaim_connection_get_account( gc );
-	
-	// Only handle this if local client requested Doodle session (else local client would have sent one)
+
+	/* Only handle this if local client requested Doodle session (else local
+	 * client would have sent one)
+	 */
 	wb		= gaim_whiteboard_get_session( account, from );
-	
-	// If a session with the remote user doesn't exist
+
+	/* If a session with the remote user doesn't exist */
 	if( wb == NULL )
 	{
-		// Ask user if he/she wishes to accept the request for a doodle session
-		// TODO Ask local user to start Doodle session with remote user
-		// NOTE This if/else statement won't work right--must use dialog results
-		
+		/* Ask user if they wish to accept the request for a doodle session */
+		/* TODO Ask local user to start Doodle session with remote user */
+		/* NOTE This if/else statement won't work right--must use dialog
+		 * results
+		 */
+
 		/*	char dialog_message[64];
 		g_sprintf( dialog_message, "%s is requesting to start a Doodle session with you.", from );
-			
+
 		gaim_notify_message( NULL, GAIM_NOTIFY_MSG_INFO, "Doodle",
 		dialog_message, NULL, NULL, NULL );
 		*/
-		
+
 		wb = gaim_whiteboard_create( account, from, DOODLE_STATE_REQUESTED );
-		
+
 		yahoo_doodle_command_send_request( gc, from );
 	}
-	
-	// TODO Might be required to clear the canvas of an existing doodle session at this point
+
+	/* TODO Might be required to clear the canvas of an existing doodle
+	 * session at this point
+	 */
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_got_ready( GaimConnection *gc, char *from )
 {
 	GaimAccount *account;
 	GaimWhiteboard *wb;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Got READY (%s)\n", from );
-	
+	gaim_debug_info("yahoo", "doodle: Got Ready (%s)\n", from);
+
 	account	= gaim_connection_get_account( gc );
-	
-	// Only handle this if local client requested Doodle session (else local client would have sent one)
+
+	/* Only handle this if local client requested Doodle session (else local
+	 * client would have sent one)
+	 */
 	wb		= gaim_whiteboard_get_session( account, from );
-							
+					
 	if( wb == NULL )
 		return;
-	
+
 	if( wb->state == DOODLE_STATE_REQUESTING )
 	{
 		gaim_whiteboard_start( wb );
-		
+
 		wb->state = DOODLE_STATE_ESTABLISHED;
-		
+
 		yahoo_doodle_command_send_confirm( gc, from );
 	}
-	
+
 	if( wb->state == DOODLE_STATE_ESTABLISHED )
 	{
-		// Ask whether to save picture too
-		
+		/* TODO Ask whether to save picture too */
 		gaim_whiteboard_clear( wb );
 	}
-	
-	// NOTE Not sure about this... I am trying to handle if the remote user already
-	// thinks we're in a session with them (when their chat message contains the doodle;11 imv key)
+
+	/* NOTE Not sure about this... I am trying to handle if the remote user
+	 * already thinks we're in a session with them (when their chat message
+	 * contains the doodle;11 imv key)
+	 */
 	if( wb->state == DOODLE_STATE_REQUESTED )
 	{
-		g_print( "Hmmmm\n" );
-		
-		//gaim_whiteboard_start( wb );
+		/* gaim_whiteboard_start( wb ); */
 		yahoo_doodle_command_send_request( gc, from );
 	}
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_got_draw( GaimConnection *gc, char *from, char *message )
 {
 	GaimAccount *account;
@@ -261,189 +266,183 @@
 	int *n;
 	GList *l;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Got DRAW (%s)\n", from );
-	
-	g_print( "Draw Message:  %s\n", message );
-	
+	gaim_debug_info("yahoo", "doodle: Got Draw (%s)\n", from);
+	gaim_debug_info("yahoo", "doodle: Draw message: %s\n", message);
+
 	account	= gaim_connection_get_account( gc );
-	
-	// Only handle this if local client requested Doodle session (else local client would have sent one)
+
+	/* Only handle this if local client requested Doodle session (else local
+	 * client would have sent one)
+	 */
 	wb		= gaim_whiteboard_get_session( account, from );
-	
+
 	if( wb == NULL )
 		return;
-	
-	// TODO Functionalize
-	// Convert drawing packet message to an integer list
-	
+
+	/* TODO Functionalize
+	 * Convert drawing packet message to an integer list
+	 */
 	token		= NULL;
 	length		= strlen( message );
-	
-	d_list		= NULL;	// a local list of drawing info
-	
-	// Check to see if the message begans and ends with quotes
+
+	d_list		= NULL;	/* a local list of drawing info */
+
+	/* Check to see if the message begans and ends with quotes */
 	if( ( message[0] != '\"' ) || ( message[length - 1] != '\"' ) )
 		return;
-	
-	// Truncate the quotations off of our message (why the hell did they add them anyways!?)
+
+	/* Truncate the quotations off of our message (why the hell did they add
+	 * them anyways!?)
+	 */
 	message[length - 1]	= ',';
 	message			= message + 1;
-	
-	// Traverse and extract all integers divided by commas
+
+	/* Traverse and extract all integers divided by commas */
 	while( ( token_end = strchr( message, ',' ) ) )
 	{
 		token_end[0]	= 0;
-		
+
 		token		= g_new0( int, 1 );
-		
+
 		*token		= atoi( message );
-		
+
 		d_list		= g_list_append( d_list, ( gpointer )( token ) );
-		
+
 		message		= token_end + 1;
 	}
-	
+
 	yahoo_doodle_draw_stroke( wb, d_list );
-	
-	//goodle_doodle_session_set_canvas_as_icon( ds );
-	
-	// Remove that shit
+
+	/* goodle_doodle_session_set_canvas_as_icon( ds ); */
+
+	/* Remove that shit */
 	n = NULL;
 	l = d_list;
 	while( l )
 	{
 		n = l->data;
-		
+
 		g_free( n );
-		
+
 		l = l->next;
 	}
-	
+
 	g_list_free( d_list );
 	d_list = NULL;
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_got_clear( GaimConnection *gc, char *from )
 {
 	GaimAccount *account;
 	GaimWhiteboard *wb;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Got CLEAR (%s)\n", from );
-	
+	gaim_debug_info("yahoo", "doodle: Got Clear (%s)\n", from);
+
 	account	= gaim_connection_get_account( gc );
-	
-	// Only handle this if local client requested Doodle session (else local client would have sent one)
+
+	/* Only handle this if local client requested Doodle session (else local
+	 * client would have sent one)
+	 */
 	wb		= gaim_whiteboard_get_session( account, from );
-	
+
 	if( wb == NULL )
 		return;
-	
+
 	if( wb->state == DOODLE_STATE_ESTABLISHED )
 	{
-		// TODO Ask user whether to save the image before clearing it
-		
+		/* TODO Ask user whether to save the image before clearing it */
+
 		gaim_whiteboard_clear( wb );
 	}
 }
 
-// ------------------------------------------------------------------------------------------------------
-
-void yahoo_doodle_command_got_extra( GaimConnection *gc, char *from, char *message )
+void
+yahoo_doodle_command_got_extra( GaimConnection *gc, char *from, char *message )
 {
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Got EXTRA (%s)\n", from );
-	
-	// I do not like these 'extra' features, so I'll only handle them in one way,
-	// which is returning them with the command/packet to turn them off
-	
+	gaim_debug_info("yahoo", "doodle: Got Extra (%s)\n", from);
+
+	/* I do not like these 'extra' features, so I'll only handle them in one
+	 * way, which is returning them with the command/packet to turn them off
+	 */
 	yahoo_doodle_command_send_extra( gc, from, DOODLE_EXTRA_NONE );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_got_confirm( GaimConnection *gc, char *from )
-{	
+{
 	GaimAccount *account;
 	GaimWhiteboard *wb;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Got CONFIRM (%s)\n", from );
-	
-	// Get the doodle session
+	gaim_debug_info("yahoo", "doodle: Got Confirm (%s)\n", from);
+
+	/* Get the doodle session */
 	account	= gaim_connection_get_account( gc );
-	
-	// Only handle this if local client requested Doodle session (else local client would have sent one)
+
+	/* Only handle this if local client requested Doodle session (else local
+	 * client would have sent one)
+	 */
 	wb		= gaim_whiteboard_get_session( account, from );
-	
+
 	if( wb == NULL )
 		return;
-	
-	// TODO Combine the following IF's?
-	
-	// Check if we requested a doodle session
+
+	/* TODO Combine the following IF's? */
+
+	/* Check if we requested a doodle session */
 	if( wb->state == DOODLE_STATE_REQUESTING )
-	{	
+	{
 		wb->state = DOODLE_STATE_ESTABLISHED;
-		
+
 		gaim_whiteboard_start( wb );
-		
+
 		yahoo_doodle_command_send_confirm( gc, from );
 	}
-	
-	// Check if we accepted a request for a doodle session
+
+	/* Check if we accepted a request for a doodle session */
 	if( wb->state == DOODLE_STATE_REQUESTED )
-	{	
+	{
 		wb->state = DOODLE_STATE_ESTABLISHED;
-		
+
 		gaim_whiteboard_start( wb );
 	}
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_got_shutdown( GaimConnection *gc, char *from )
 {
 	GaimAccount *account;
 	GaimWhiteboard *wb;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Got SHUTDOWN (%s)\n", from );
-	
+	gaim_debug_info("yahoo", "doodle: Got Shutdown (%s)\n", from);
+
 	account	= gaim_connection_get_account( gc );
-	
-	// Only handle this if local client requested Doodle session (else local client would have sent one)
+
+	/* Only handle this if local client requested Doodle session (else local
+	 * client would have sent one)
+	 */
 	wb		= gaim_whiteboard_get_session( account, from );
-	
-	// TODO Ask if user wants to save picture before the session is closed
-	
-	// If this session doesn't exist, don't try and kill it
+
+	/* TODO Ask if user wants to save picture before the session is closed */
+
+	/* If this session doesn't exist, don't try and kill it */
 	if( wb == NULL )
 		return;
 	else
 	{
 		gaim_whiteboard_destroy( wb );
-		
-		//yahoo_doodle_command_send_shutdown( gc, from );
+
+		/* yahoo_doodle_command_send_shutdown( gc, from ); */
 	}
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_send_request( GaimConnection *gc, char *to )
 {
 	struct yahoo_data	*yd;
 	struct yahoo_packet	*pkt;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Sent REQUEST (%s)\n", to );
-	
+	gaim_debug_info("yahoo", "doodle: Sent Request (%s)\n", to);
+
 	yd = gc->proto_data;
 
-	// Make and send an acknowledge (ready) Doodle packet
+	/* Make and send an acknowledge (ready) Doodle packet */
 	pkt = yahoo_packet_new( YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, 0 );
 	yahoo_packet_hash_str( pkt, 49,		"IMVIRONMENT" );
 	yahoo_packet_hash_str( pkt, 1,		gaim_account_get_username( gc->account ) );
@@ -453,23 +452,20 @@
 	yahoo_packet_hash_str( pkt, 63,		"doodle;11" );
 	yahoo_packet_hash_str( pkt, 64,		"1" );
 	yahoo_packet_hash_str( pkt, 1002,	"1" );
-	
+
 	yahoo_packet_send_and_free( pkt, yd );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_send_ready( GaimConnection *gc, char *to )
 {
 	struct yahoo_data	*yd;
 	struct yahoo_packet	*pkt;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Sent READY (%s)\n", to );
-	
+	gaim_debug_info("yahoo", "doodle: Sent Ready (%s)\n", to);
+
 	yd = gc->proto_data;
-	
-	// Make and send a request to start a Doodle session
+
+	/* Make and send a request to start a Doodle session */
 	pkt = yahoo_packet_new( YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, 0 );
 	yahoo_packet_hash_str( pkt, 49,		"IMVIRONMENT" );
 	yahoo_packet_hash_str( pkt, 1,		gaim_account_get_username( gc->account ) );
@@ -479,23 +475,20 @@
 	yahoo_packet_hash_str( pkt, 63,		"doodle;11" );
 	yahoo_packet_hash_str( pkt, 64,		"0" );
 	yahoo_packet_hash_str( pkt, 1002,	"1" );
-	
+
 	yahoo_packet_send_and_free( pkt, yd );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_send_draw( GaimConnection *gc, char *to, char *message )
 {
 	struct yahoo_data	*yd;
 	struct yahoo_packet	*pkt;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Sent DRAW (%s)\n", to );
-	
+	gaim_debug_info("yahoo", "doodle: Sent Draw (%s)\n", to);
+
 	yd = gc->proto_data;
-	
-	// Make and send a drawing packet
+
+	/* Make and send a drawing packet */
 	pkt = yahoo_packet_new( YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, 0 );
 	yahoo_packet_hash_str( pkt, 49,		"IMVIRONMENT" );
 	yahoo_packet_hash_str( pkt, 1,		gaim_account_get_username( gc->account ) );
@@ -505,23 +498,20 @@
 	yahoo_packet_hash_str( pkt, 63,		"doodle;11" );
 	yahoo_packet_hash_str( pkt, 64,		"1" );
 	yahoo_packet_hash_str( pkt, 1002,	"1" );
-	
+
 	yahoo_packet_send_and_free( pkt, yd );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_send_clear( GaimConnection *gc, char *to )
 {
 	struct yahoo_data	*yd;
 	struct yahoo_packet	*pkt;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Sent CLEAR (%s)\n", to );
-	
+	gaim_debug_info("yahoo", "doodle: Sent Clear (%s)\n", to);
+
 	yd = gc->proto_data;
-	
-	// Make and send a request to clear packet
+
+	/* Make and send a request to clear packet */
 	pkt = yahoo_packet_new( YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, 0 );
 	yahoo_packet_hash_str( pkt, 49,		"IMVIRONMENT" );
 	yahoo_packet_hash_str( pkt, 1,		gaim_account_get_username( gc->account ) );
@@ -531,23 +521,20 @@
 	yahoo_packet_hash_str( pkt, 63,		"doodle;11" );
 	yahoo_packet_hash_str( pkt, 64,		"1" );
 	yahoo_packet_hash_str( pkt, 1002,	"1" );
-	
+
 	yahoo_packet_send_and_free( pkt, yd );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_send_extra( GaimConnection *gc, char *to, char *message )
 {
 	struct yahoo_data	*yd;
 	struct yahoo_packet	*pkt;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Sent EXTRA (%s)\n", to );
-	
+	gaim_debug_info("yahoo", "doodle: Sent Extra (%s)\n", to);
+
 	yd = gc->proto_data;
-		
-	// Send out a request to use a specified 'extra' feature (message)
+
+	/* Send out a request to use a specified 'extra' feature (message) */
 	pkt = yahoo_packet_new( YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, 0 );
 	yahoo_packet_hash_str( pkt, 49,		"IMVIRONMENT" );
 	yahoo_packet_hash_str( pkt, 1,		gaim_account_get_username( gc->account ) );
@@ -557,23 +544,20 @@
 	yahoo_packet_hash_str( pkt, 63,		"doodle;11" );
 	yahoo_packet_hash_str( pkt, 64,		"1" );
 	yahoo_packet_hash_str( pkt, 1002,	"1" );
-	
+
 	yahoo_packet_send_and_free( pkt, yd );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_send_confirm( GaimConnection *gc, char *to )
 {
 	struct yahoo_data	*yd;
 	struct yahoo_packet	*pkt;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Sent CONFIRM (%s)\n", to );
-	
+	gaim_debug_info("yahoo", "doodle: Sent Confirm (%s)\n", to);
+
 	yd = gc->proto_data;
-	
-	// Send ready packet (that local client accepted and is ready)
+
+	/* Send ready packet (that local client accepted and is ready) */
 	pkt = yahoo_packet_new( YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, 0 );
 	yahoo_packet_hash_str( pkt, 49,		"IMVIRONMENT" );
 	yahoo_packet_hash_str( pkt, 1,		( char* )( gaim_account_get_username( gc->account ) ) );
@@ -583,23 +567,20 @@
 	yahoo_packet_hash_str( pkt, 63,		"doodle;11" );
 	yahoo_packet_hash_str( pkt, 64,		"1" );
 	yahoo_packet_hash_str( pkt, 1002,	"1" );
-	
+
 	yahoo_packet_send_and_free( pkt, yd );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_command_send_shutdown( GaimConnection *gc, char *to )
 {
 	struct yahoo_data	*yd;
 	struct yahoo_packet	*pkt;
 
-	g_print( "-----------------------------------------------\n" );
-	g_print( "Sent SHUTDOWN (%s)\n", to );
-	
+	gaim_debug_info("yahoo", "doodle: Sent Shutdown (%s)\n", to);
+
 	yd = gc->proto_data;
-	
-	// Declare that you are ending the Doodle session
+
+	/* Declare that you are ending the Doodle session */
 	pkt = yahoo_packet_new( YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, 0 );
 	yahoo_packet_hash_str( pkt, 49,		"IMVIRONMENT" );
 	yahoo_packet_hash_str( pkt, 1,		gaim_account_get_username( gc->account ) );
@@ -609,161 +590,147 @@
 	yahoo_packet_hash_str( pkt, 63,		";0" );
 	yahoo_packet_hash_str( pkt, 64,		"0" );
 	yahoo_packet_hash_str( pkt, 1002,	"1" );
-	
+
 	yahoo_packet_send_and_free( pkt, yd );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_start( GaimWhiteboard *wb )
 {
 	doodle_session *ds	= g_new0( doodle_session, 1 );
 
-	//g_print( "yahoo_doodle_start()\n" );
-	
-	// Set default brush size and color
+	/* g_print( "yahoo_doodle_start()\n" ); */
+
+	/* Set default brush size and color */
 	ds->brush_size		= DOODLE_BRUSH_MEDIUM;
-	ds->brush_color		= 0;	// black
-	
+	ds->brush_color		= 0;	/* black */
+
 	wb->proto_data		= ds;
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_end( GaimWhiteboard *wb )
 {
 	GaimConnection *gc = gaim_account_get_connection( wb->account );
 	doodle_session *ds;
-	
-	//g_print( "yahoo_doodle_end()\n" );
-	
+
+	/* g_print( "yahoo_doodle_end()\n" ); */
+
 	yahoo_doodle_command_send_shutdown( gc, wb->who );
-	
+
 	ds = wb->proto_data;
 	if( ds )
 		g_free( ds );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_get_dimensions( GaimWhiteboard *wb, int *width, int *height )
 {
-	// Standard Doodle canvases are of one size:  368x256
+	/* standard Doodle canvases are of one size:  368x256 */
 	*width	= DOODLE_CANVAS_WIDTH;
 	*height	= DOODLE_CANVAS_HEIGHT;
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_send_draw_list( GaimWhiteboard *wb, GList *draw_list )
 {
 	doodle_session	*ds		= wb->proto_data;
 	char 		*message	= yahoo_doodle_build_draw_string( ds, draw_list );
-	
-	//g_print( "yahoo_doodle_send_draw_list()\n" );
-	
+
+	/* g_print( "yahoo_doodle_send_draw_list()\n" ); */
+
 	if( message )
 		yahoo_doodle_command_send_draw( wb->account->gc, wb->who, message );
 
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_clear( GaimWhiteboard *wb )
 {
 	yahoo_doodle_command_send_clear( wb->account->gc, wb->who );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 void yahoo_doodle_draw_stroke( GaimWhiteboard *wb, GList *draw_list )
 {
-	// Traverse through the list and draw the points and lines
-	
+	/* Traverse through the list and draw the points and lines */
+
 	GList	*l = draw_list;
-	
+
 	int	*n = NULL;
-	
+
 	int	brush_color;
 	int	brush_size;
 	int	x;
 	int	y;
-	
+
 	int	dx, dy;
-	
+
 	int count = 0;
-	
-	//g_print( "Drawing: color=%d, size=%d, (%d,%d)\n", brush_color, brush_size, x, y );
-	
+
+	/*
+	g_print( "Drawing: color=%d, size=%d, (%d,%d)\n", brush_color, brush_size,
+			x, y );
+	*/
+
 	n = l->data; brush_color = *n; l = l->next;
 	n = l->data; brush_size	 = *n; l = l->next;
 	n = l->data; x		 = *n; l = l->next;
 	n = l->data; y		 = *n; l = l->next;
-	
-	// Pray this works and pray that the list has an even number of elements
+
+	/* Pray this works and pray that the list has an even number of elements */
 	while( l )
 	{
 		count++;
-		
+
 		n = l->data; dx	= *n; l = l->next;
 		n = l->data; dy	= *n; l = l->next;
-		
+
 		gaim_whiteboard_draw_line( wb,
 					   x, y,
 					   x + dx, y + dy,
 					   brush_color, brush_size );
-		
+
 		x = x + dx;
 		y = y + dy;
 	}
-	
-	//g_print( "Counted %d deltas\n", count );
 }
 
-// ------------------------------------------------------------------------------------------------------
-
 char *yahoo_doodle_build_draw_string( doodle_session *ds, GList *draw_list )
 {
-	//g_print( "yahoo_doodle_build_draw_string()\n" );
-	
 	GList		*l = draw_list;
-	
+
 	int		*n = NULL;
-	
-	static char	message[1024];		// Hope that 1024 is enough
-	char		token_string[16];	// Token string extracted from draw list
-	
+
+	static char	message[1024]; /* Hope that 1024 is enough */
+	char		token_string[16]; /* Token string extracted from draw list */
+
 	if( draw_list == NULL )
-		return( NULL );	
-	
+		return( NULL );
+
 	strcpy( message, "\"" );
-	
+
 	sprintf( token_string, "%d,%d,", ds->brush_color, ds->brush_size );
 	strcat( message, token_string );
-	
-	// Pray this works and pray that the list has an even number of elements
+
+	/* Pray this works and pray that the list has an even number of elements */
 	while( l )
 	{
 		n = l->data;
-		
+
 		sprintf( token_string, "%d,", *n );
-		
-		// This check prevents overflow
+
+		/* This check prevents overflow */
 		if( ( strlen( message ) + strlen( token_string ) ) < 1024 )
 			strcat( message, token_string );
 		else
 			break;
-		
+
 		l = l->next;
 	}
-	
+
 	message[strlen( message ) - 1]	= '\"';
-	//message[strlen( message )]	= 0;
-	//message[511]			= 0;
-	
-	//g_print( "Draw Message:  %s\n", message );
-	
+	/*
+	message[strlen( message )]	= 0;
+	message[511]			= 0;
+
+	g_print( "Draw Message:  %s\n", message );
+	*/
+
 	return( message );
 }
 
-// ------------------------------------------------------------------------------------------------------
--- a/src/protocols/yahoo/yahoo_doodle.h	Mon Oct 24 20:56:12 2005 +0000
+++ b/src/protocols/yahoo/yahoo_doodle.h	Mon Oct 24 21:48:21 2005 +0000
@@ -25,13 +25,16 @@
 #ifndef _YAHOO_DOODLE_H_
 #define _YAHOO_DOODLE_H_
 
-// INCLUDES ============================================================================================
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
 #include "whiteboard.h"
 #include "cmds.h"
 
-// DEFINES =============================================================================================
-
-// Doodle communication commands
+/******************************************************************************
+ * Defines
+ *****************************************************************************/
+/* Doodle communication commands */
 #define DOODLE_CMD_REQUEST		0
 #define DOODLE_CMD_READY		1
 #define DOODLE_CMD_CLEAR		2
@@ -39,23 +42,23 @@
 #define DOODLE_CMD_EXTRA		4
 #define DOODLE_CMD_CONFIRM		5
 
-// Doodle communication command for shutting down (also 0)
+/* Doodle communication command for shutting down (also 0) */
 #define DOODLE_CMD_SHUTDOWN		DOODLE_CMD_REQUEST
 
 #define DOODLE_EXTRA_NONE		"\"1\""
 #define DOODLE_EXTRA_TICTACTOE		"\"3\""
 #define DOODLE_EXTRA_DOTS		"\"2\""
 
-// Doodle session states
+/* Doodle session states */
 #define DOODLE_STATE_REQUESTING		0
 #define DOODLE_STATE_REQUESTED		1
 #define DOODLE_STATE_ESTABLISHED	2
 
-// Doodle canvas dimensions
+/* Doodle canvas dimensions */
 #define DOODLE_CANVAS_WIDTH		368
 #define DOODLE_CANVAS_HEIGHT		256
 
-// Doodle color codes (most likely RGB)
+/* Doodle color codes (most likely RGB) */
 #define	DOODLE_COLOR_RED		13369344
 #define	DOODLE_COLOR_ORANGE		16737792
 #define	DOODLE_COLOR_YELLOW		15658496
@@ -72,22 +75,25 @@
 
 #define PALETTE_NUM_OF_COLORS		12
 
-// Doodle brush sizes (most likely variable)
+/* Doodle brush sizes (most likely variable) */
 #define DOODLE_BRUSH_SMALL		2
 #define DOODLE_BRUSH_MEDIUM		5
 #define DOODLE_BRUSH_LARGE		10
 
 #define DOODLE_MAX_BRUSH_MOTIONS	100
 
-// DATATYPES ===========================================================================================
+/******************************************************************************
+ * Datatypes
+ *****************************************************************************/
 typedef struct _doodle_session
 {
-	int		brush_size;	// Size of drawing brush
-	int		brush_color;	// Color of drawing brush
+	int		brush_size;	/* Size of drawing brush */
+	int		brush_color;	/* Color of drawing brush */
 } doodle_session;
 
-// PROTOTYPES ==========================================================================================
-
+/******************************************************************************
+ * API
+ *****************************************************************************/
 void dummy_func( void );
 
 GaimCmdRet		yahoo_doodle_gaim_cmd_start( GaimConversation *conv, const char *cmd, char **args,
@@ -121,4 +127,4 @@
 void			yahoo_doodle_draw_stroke( GaimWhiteboard *wb, GList *draw_list );
 char			*yahoo_doodle_build_draw_string( doodle_session *ds, GList *draw_list );
 
-#endif // _YAHOO_DOODLE_H_
+#endif /* _YAHOO_DOODLE_H_ */
--- a/src/protocols/yahoo/yahoo_filexfer.c	Mon Oct 24 20:56:12 2005 +0000
+++ b/src/protocols/yahoo/yahoo_filexfer.c	Mon Oct 24 21:48:21 2005 +0000
@@ -357,46 +357,48 @@
 	char	*imv		= NULL;
 	char	*unknown	= NULL;
 
-	// Get all the necessary values from this new packet
+	/* Get all the necessary values from this new packet */
 	while( l )
 	{
 		struct yahoo_pair *pair = l->data;
 
-		if( pair->key == 5 )		// Get who the packet is for
+		if( pair->key == 5 )		/* Get who the packet is for */
 			me = pair->value;
 
-		if( pair->key == 4 )		// Get who the packet is from
+		if( pair->key == 4 )		/* Get who the packet is from */
 			from = pair->value;
 
-		if( pair->key == 49 )		// Get the type of service
+		if( pair->key == 49 )		/* Get the type of service */
 			service = pair->value;
 
-		if( pair->key == 14 )		// Get the 'message' of the packet
+		if( pair->key == 14 )		/* Get the 'message' of the packet */
 			message = pair->value;
 
-		if( pair->key == 13 )		// Get the command associated with this packet
+		if( pair->key == 13 )		/* Get the command associated with this packet */
 			command = pair->value;
 
-		if( pair->key == 63 )		// IMVironment name and version
+		if( pair->key == 63 )		/* IMVironment name and version */
 			imv = pair->value;
 
-		if( pair->key == 64 )		// Not sure, but it does vary with initialization of Doodle
-			unknown = pair->value;	// So, I'll keep it (for a little while atleast)
+		if( pair->key == 64 )		/* Not sure, but it does vary with initialization of Doodle */
+			unknown = pair->value;	/* So, I'll keep it (for a little while atleast) */
 
 		l = l->next;
 	}
 
-	// If this packet is an IMVIRONMENT, handle it accordingly
+	/* If this packet is an IMVIRONMENT, handle it accordingly */
 	if( !strcmp( service, "IMVIRONMENT" ) )
 	{
-		// Check for a Doodle packet and handle it accordingly
+		/* Check for a Doodle packet and handle it accordingly */
 		if( !strcmp( imv, "doodle;11" ) )
 			yahoo_doodle_process( gc, me, from, command, message );
 
-		// If an IMVIRONMENT packet comes without a specific imviroment name
+		/* If an IMVIRONMENT packet comes without a specific imviroment name */
 		if( !strcmp( imv, ";0" ) )
 		{
-			// It is unfortunately time to close all IMVironments with remote client
+			/* It is unfortunately time to close all IMVironments with remote
+			 * client
+			 */
 			yahoo_doodle_command_got_shutdown( gc, from );
 		}
 	}