From: <the...@us...> - 2006-07-02 23:56:48
|
Revision: 16405 Author: thekingant Date: 2006-07-02 16:56:44 -0700 (Sun, 02 Jul 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16405&view=rev Log Message: ----------- Backport SVN revision #16404 from HEAD to v2_0_0 Original commit message: Fix a small bug in oscar where the "Send File" option in the conversation menu would be greyed out if the buddy is not in your buddy list. Thanks to foo in #gaim for pointing this out, unbeknowest to him. ViewCVS Links: ------------- http://svn.sourceforge.net/gaim/?rev=16404&view=rev Modified Paths: -------------- branches/v2_0_0/src/protocols/oscar/oscar.c Modified: branches/v2_0_0/src/protocols/oscar/oscar.c =================================================================== --- branches/v2_0_0/src/protocols/oscar/oscar.c 2006-07-02 23:56:08 UTC (rev 16404) +++ branches/v2_0_0/src/protocols/oscar/oscar.c 2006-07-02 23:56:44 UTC (rev 16405) @@ -6161,8 +6161,8 @@ * Don't allowing sending a file to a user that does not support * file transfer, and don't allow sending to ourselves. */ - if ((userinfo != NULL) && - (userinfo->capabilities & OSCAR_CAPABILITY_SENDFILE) && + if (((userinfo == NULL) || + (userinfo->capabilities & OSCAR_CAPABILITY_SENDFILE)) && aim_sncmp(who, gaim_account_get_username(account))) { return TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |