pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16138] trunk/src/ft.c

[<rl...@us...>]

Revision: 16138
Author:   rlaager
Date:     2006-05-07 00:55:13 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16138&view=rev

Log Message:
-----------
Patch sent to gaim-devel by Aleksander Piotrowski

"According to declaration, last argument of gaim_xfer_write should be gsize."

Modified Paths:
--------------
    trunk/src/ft.c
Modified: trunk/src/ft.c
===================================================================
--- trunk/src/ft.c	2006-05-06 01:12:12 UTC (rev 16137)
+++ trunk/src/ft.c	2006-05-07 07:55:13 UTC (rev 16138)
@@ -800,7 +800,7 @@
 }
 
 gssize
-gaim_xfer_write(GaimXfer *xfer, const guchar *buffer, size_t size)
+gaim_xfer_write(GaimXfer *xfer, const guchar *buffer, gsize size)
 {
 	gssize r, s;
 


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

[Gaim-commits] SF.net SVN: gaim: [16285] trunk/src/ft.c

[<rl...@us...>]

Revision: 16285
Author:   rlaager
Date:     2006-06-18 23:23:20 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16285&view=rev

Log Message:
-----------
Fix a case of a file transfer "system message" notification where we were not looking up an alias like everywhere else in this file.

Modified Paths:
--------------
    trunk/src/ft.c
Modified: trunk/src/ft.c
===================================================================
--- trunk/src/ft.c	2006-06-19 06:22:26 UTC (rev 16284)
+++ trunk/src/ft.c	2006-06-19 06:23:20 UTC (rev 16285)
@@ -388,8 +388,9 @@
 		           gaim_xfer_get_status(xfer) == GAIM_XFER_STATUS_ACCEPTED)
 		{
 			gchar* message = NULL;
+			GaimBuddy *buddy = gaim_find_buddy(xfer->account, xfer->who);
 			message = g_strdup_printf(_("%s is offering to send file %s"),
-				xfer->who, gaim_xfer_get_filename(xfer));
+				buddy ? gaim_buddy_get_alias(buddy) : xfer->who, gaim_xfer_get_filename(xfer));
 			gaim_xfer_conversation_write(xfer, message, FALSE);
 			g_free(message);
 			/* Ask for a filename to save to if it's not already given by a plugin */


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