Mercurial > pidgin.yaz
comparison libpurple/buddyicon.c @ 26851:6bc0e4e76207
merge of '9df36977fc8f70d1b3124d32a54eb123df50aa0f'
and 'f92d95c83baba97463f923077688ba2eb144763b'
| author | Peter Hjalmarsson <xake@rymdraket.net> |
|---|---|
| date | Fri, 01 May 2009 21:36:29 +0000 |
| parents | dc05a7128d88 |
| children | 1a1c12c122c9 |
comparison
equal
deleted
inserted
replaced
| 26270:15911f71e37f | 26851:6bc0e4e76207 |
|---|---|
| 1297 g_hash_table_destroy(account_cache); | 1297 g_hash_table_destroy(account_cache); |
| 1298 g_hash_table_destroy(icon_data_cache); | 1298 g_hash_table_destroy(icon_data_cache); |
| 1299 g_hash_table_destroy(icon_file_cache); | 1299 g_hash_table_destroy(icon_file_cache); |
| 1300 g_hash_table_destroy(pointer_icon_cache); | 1300 g_hash_table_destroy(pointer_icon_cache); |
| 1301 g_free(old_icons_dir); | 1301 g_free(old_icons_dir); |
| 1302 g_free(cache_dir); | |
| 1302 } | 1303 } |
| 1303 | 1304 |
| 1304 void purple_buddy_icon_get_scale_size(PurpleBuddyIconSpec *spec, int *width, int *height) | 1305 void purple_buddy_icon_get_scale_size(PurpleBuddyIconSpec *spec, int *width, int *height) |
| 1305 { | 1306 { |
| 1306 int new_width, new_height; | 1307 int new_width, new_height; |