diff options
| author | Gary Kramlich <grim@reaperworld.com> | 2017-10-20 04:34:11 +0000 |
|---|---|---|
| committer | Gary Kramlich <grim@reaperworld.com> | 2017-10-20 04:34:11 +0000 |
| commit | 915ecc5407b39c011af8f048339f35d8419ee9c0 (patch) | |
| tree | 3d46afc24c99c54431bfe7aaf942c7bf84326a18 | |
| parent | d2439cd8bc535651586e67af28573575aeb2a7fd (diff) | |
| parent | 23b57e3a1d61c50ed16abd3194845d41aa6e3a48 (diff) | |
| download | pidgin-915ecc5407b39c011af8f048339f35d8419ee9c0.tar.gz | |
Merged in dwmw2/pidgin/default (pull request #276)
Do not rewrite custom buddy icons already in the cache (#17259)
Approved-by: Eion Robb <eionrobb@gmail.com>
Approved-by: Gary Kramlich <grim@reaperworld.com>
| -rw-r--r-- | libpurple/buddyicon.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libpurple/buddyicon.c b/libpurple/buddyicon.c index 7f5a290539..14e03c09b9 100644 --- a/libpurple/buddyicon.c +++ b/libpurple/buddyicon.c @@ -174,8 +174,12 @@ purple_buddy_icon_data_cache(PurpleStoredImage *img) } } - purple_util_write_data_to_file_absolute(path, purple_imgstore_get_data(img), - purple_imgstore_get_size(img)); + if (!g_file_test(path, G_FILE_TEST_IS_REGULAR)) + { + purple_util_write_data_to_file_absolute(path, purple_imgstore_get_data(img), + purple_imgstore_get_size(img)); + } + g_free(path); } |