# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1177893901 0
# Node ID 4a020cf5942de763dd96cdecf3ecba702de7fc41
# Parent  34618fedf5b94e344c8c3641c3cbb0a54f64f55c# Parent  7fad94837f9eac38301fab7cd976531f96751bdb
merge of '45bdc7f0cf3d3c9229f3fcd9de71b882131c05c0'
     and '8ce6e4b908249fabc820ae1eb512cc4ee075282a'

diff -r 7fad94837f9e -r 4a020cf5942d libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Mon Apr 30 00:36:30 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Mon Apr 30 00:45:01 2007 +0000
@@ -76,7 +76,8 @@
 	purple_privacy_permit_remove(gc->account,who,TRUE);
 }
 
-gboolean yahoo_privacy_check(PurpleConnection *gc, const char *who)
+gboolean
+yahoo_privacy_check(PurpleConnection *gc, const char *who)
 {
 	/* returns TRUE if allowed through, FALSE otherwise */
 	gboolean permitted;
diff -r 7fad94837f9e -r 4a020cf5942d libpurple/protocols/yahoo/yahoo_picture.c
--- a/libpurple/protocols/yahoo/yahoo_picture.c	Mon Apr 30 00:36:30 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_picture.c	Mon Apr 30 00:45:01 2007 +0000
@@ -546,7 +546,9 @@
 
 		/* TODO: At some point, it'd be nice to fix this for real, or
 		 * TODO: at least change it to be something like:
-		 * TODO: purple_imgstore_get_filename(img); */
+		 * TODO: purple_imgstore_get_filename(img);
+		 * TODO: But it would be great if we knew how to calculate the
+		 * TODO: Checksum correctly. */
 		yd->picture_checksum = g_string_hash(s);
 
 		if ((yd->picture_checksum == oldcksum) &&
@@ -559,10 +561,8 @@
 			return;
 		}
 
-		/* TODO: FIXME: This is completely wrong.  The upload code needs to
-		 * TODO: be modified to work with a PurpleStoredImage. */
-		iconfile = g_build_filename(purple_buddy_icons_get_cache_dir(),
-		                            purple_imgstore_get_filename(img), NULL);
+		/* We use this solely for sending a filename to the server */
+		iconfile = g_strdup(purple_imgstore_get_filename(img));
 		d = g_new0(struct yahoo_buddy_icon_upload_data, 1);
 		d->gc = gc;
 		d->str = s;