Mercurial > pidgin
comparison libpurple/gaim-compat.h @ 16492:74daf9fc9cf3
merge of '3ee86d1e423ebfd391c26b73ae7ed1b75353d2cf'
and '53e71fc52c4d4be3947b2404fe6332ae8d52dc55'
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Fri, 27 Apr 2007 04:03:04 +0000 |
parents | 391a79778f89 |
children | 72e4e92f9a2c |
comparison
equal
deleted
inserted
replaced
16467:e331baecd661 | 16492:74daf9fc9cf3 |
---|---|
341 #define gaim_buddy_icon_new purple_buddy_icon_new | 341 #define gaim_buddy_icon_new purple_buddy_icon_new |
342 #define gaim_buddy_icon_destroy purple_buddy_icon_destroy | 342 #define gaim_buddy_icon_destroy purple_buddy_icon_destroy |
343 #define gaim_buddy_icon_ref purple_buddy_icon_ref | 343 #define gaim_buddy_icon_ref purple_buddy_icon_ref |
344 #define gaim_buddy_icon_unref purple_buddy_icon_unref | 344 #define gaim_buddy_icon_unref purple_buddy_icon_unref |
345 #define gaim_buddy_icon_update purple_buddy_icon_update | 345 #define gaim_buddy_icon_update purple_buddy_icon_update |
346 #define gaim_buddy_icon_cache purple_buddy_icon_cache | |
347 #define gaim_buddy_icon_uncache purple_buddy_icon_uncache | |
348 | 346 |
349 #define gaim_buddy_icon_set_account purple_buddy_icon_set_account | 347 #define gaim_buddy_icon_set_account purple_buddy_icon_set_account |
350 #define gaim_buddy_icon_set_username purple_buddy_icon_set_username | 348 #define gaim_buddy_icon_set_username purple_buddy_icon_set_username |
351 #define gaim_buddy_icon_set_data purple_buddy_icon_set_data | 349 #define gaim_buddy_icon_set_data purple_buddy_icon_set_protocol_data |
352 #define gaim_buddy_icon_set_path purple_buddy_icon_set_path | |
353 | 350 |
354 #define gaim_buddy_icon_get_account purple_buddy_icon_get_account | 351 #define gaim_buddy_icon_get_account purple_buddy_icon_get_account |
355 #define gaim_buddy_icon_get_username purple_buddy_icon_get_username | 352 #define gaim_buddy_icon_get_username purple_buddy_icon_get_username |
356 #define gaim_buddy_icon_get_data purple_buddy_icon_get_data | 353 #define gaim_buddy_icon_get_data purple_buddy_icon_get_data |
357 #define gaim_buddy_icon_get_path purple_buddy_icon_get_path | 354 #define gaim_buddy_icon_get_type purple_buddy_icon_get_extension |
358 #define gaim_buddy_icon_get_type purple_buddy_icon_get_type | |
359 | 355 |
360 #define gaim_buddy_icons_set_for_user purple_buddy_icons_set_for_user | 356 #define gaim_buddy_icons_set_for_user purple_buddy_icons_set_for_user |
361 #define gaim_buddy_icons_find purple_buddy_icons_find | 357 #define gaim_buddy_icons_find purple_buddy_icons_find |
362 #define gaim_buddy_icons_set_caching purple_buddy_icons_set_caching | 358 #define gaim_buddy_icons_set_caching purple_buddy_icons_set_caching |
363 #define gaim_buddy_icons_is_caching purple_buddy_icons_is_caching | 359 #define gaim_buddy_icons_is_caching purple_buddy_icons_is_caching |
364 #define gaim_buddy_icons_set_cache_dir purple_buddy_icons_set_cache_dir | 360 #define gaim_buddy_icons_set_cache_dir purple_buddy_icons_set_cache_dir |
365 #define gaim_buddy_icons_get_cache_dir purple_buddy_icons_get_cache_dir | 361 #define gaim_buddy_icons_get_cache_dir purple_buddy_icons_get_cache_dir |
366 #define gaim_buddy_icons_get_full_path purple_buddy_icons_get_full_path | |
367 #define gaim_buddy_icons_get_handle purple_buddy_icons_get_handle | 362 #define gaim_buddy_icons_get_handle purple_buddy_icons_get_handle |
368 | 363 |
369 #define gaim_buddy_icons_init purple_buddy_icons_init | 364 #define gaim_buddy_icons_init purple_buddy_icons_init |
370 #define gaim_buddy_icons_uninit purple_buddy_icons_uninit | 365 #define gaim_buddy_icons_uninit purple_buddy_icons_uninit |
371 | 366 |
965 | 960 |
966 /* from imgstore.h */ | 961 /* from imgstore.h */ |
967 | 962 |
968 #define GaimStoredImage PurpleStoredImage | 963 #define GaimStoredImage PurpleStoredImage |
969 | 964 |
970 #define gaim_imgstore_add purple_imgstore_add | 965 #define gaim_imgstore_add purple_imgstore_add_with_id |
971 #define gaim_imgstore_get purple_imgstore_get | 966 #define gaim_imgstore_get purple_imgstore_find_by_id |
972 #define gaim_imgstore_get_data purple_imgstore_get_data | 967 #define gaim_imgstore_get_data purple_imgstore_get_data |
973 #define gaim_imgstore_get_size purple_imgstore_get_size | 968 #define gaim_imgstore_get_size purple_imgstore_get_size |
974 #define gaim_imgstore_get_filename purple_imgstore_get_filename | 969 #define gaim_imgstore_get_filename purple_imgstore_get_filename |
975 #define gaim_imgstore_ref purple_imgstore_ref | 970 #define gaim_imgstore_ref purple_imgstore_ref_by_id |
976 #define gaim_imgstore_unref purple_imgstore_unref | 971 #define gaim_imgstore_unref purple_imgstore_unref_by_id |
977 | 972 |
978 | 973 |
979 /* from log.h */ | 974 /* from log.h */ |
980 | 975 |
981 #define GaimLog PurpleLog | 976 #define GaimLog PurpleLog |
2235 | 2230 |
2236 #define gaim_value_new purple_value_new | 2231 #define gaim_value_new purple_value_new |
2237 #define gaim_value_new_outgoing purple_value_new_outgoing | 2232 #define gaim_value_new_outgoing purple_value_new_outgoing |
2238 #define gaim_value_destroy purple_value_destroy | 2233 #define gaim_value_destroy purple_value_destroy |
2239 #define gaim_value_dup purple_value_dup | 2234 #define gaim_value_dup purple_value_dup |
2240 #define gaim_value_get_type purple_value_get_type | 2235 #define gaim_value_purple_buddy_icon_get_extensionget_type purple_value_get_type |
2241 #define gaim_value_get_subtype purple_value_get_subtype | 2236 #define gaim_value_get_subtype purple_value_get_subtype |
2242 #define gaim_value_get_specific_type purple_value_get_specific_type | 2237 #define gaim_value_get_specific_type purple_value_get_specific_type |
2243 #define gaim_value_is_outgoing purple_value_is_outgoing | 2238 #define gaim_value_is_outgoing purple_value_is_outgoing |
2244 #define gaim_value_set_char purple_value_set_char | 2239 #define gaim_value_set_char purple_value_set_char |
2245 #define gaim_value_set_uchar purple_value_set_uchar | 2240 #define gaim_value_set_uchar purple_value_set_uchar |