Mercurial > pidgin
changeset 16545:69e36b560549
merge of '45acf7a629de79f67b489f696c7915cd9984f33e'
and 'ec79ae2dcfe6e351a1645fe922b1327fe6c0a711'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 28 Apr 2007 02:29:48 +0000 |
| parents | 72e51db8cac3 (diff) e98cd6ed5c13 (current diff) |
| children | 1f9cba8efdfb |
| files | PROGRAMMING_NOTES libpurple/buddyicon.c |
| diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/buddyicon.c Sat Apr 28 02:29:26 2007 +0000 +++ b/libpurple/buddyicon.c Sat Apr 28 02:29:48 2007 +0000 @@ -98,7 +98,6 @@ { PurpleCipherContext *context; gchar digest[41]; - const char *ext; context = purple_cipher_context_new_by_name("sha1", NULL); if (context == NULL) @@ -116,10 +115,9 @@ } purple_cipher_context_destroy(context); - ext = purple_util_get_image_extension(icon_data, icon_len); - /* Return the filename */ - return g_strdup_printf("%s%s%s", digest, ext ? "." : "", ext ? ext : ""); + return g_strdup_printf("%s.%s", digest, + purple_util_get_image_extension(icon_data, icon_len)); } static void