changeset
Merged in dwmw2/pidgin/default (pull request #276)
Fri, 20 Oct 2017 04:34:11 +0000
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Fri, 20 Oct 2017 04:34:11 +0000
- branch
- release-2.x.y
- changeset 38735
- ac8dab7bc4b6
- parent 38733
- 8bd4946501fb (current diff)
- parent 38734
- bde01a73937d (diff)
- child 38736
- 290444f128eb
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>
--- a/libpurple/buddyicon.c Fri Oct 20 04:31:39 2017 +0000 +++ b/libpurple/buddyicon.c Fri Oct 20 04:34:11 2017 +0000 @@ -174,8 +174,12 @@ } } - 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); }
