comparison libpurple/buddyicon.c @ 25741:7183d12b96ed

propagate from branch 'im.pidgin.pidgin' (head 311b4db51b575e1baa7f78d751ff926475edecc3) to branch 'im.pidgin.cpw.malu.xmpp.ibb_ft' (head 2547f95c32d530b4f5c2d0cb5e65860482dc8138)
author Marcus Lundblad <ml@update.uu.se>
date Thu, 13 Nov 2008 19:50:53 +0000
parents 8282911d5e17
children 9c0337d4b878 5ebfa814b9e8
comparison
equal deleted inserted replaced
25740:6ef1197c2db6 25741:7183d12b96ed
21 * 21 *
22 * You should have received a copy of the GNU General Public License 22 * You should have received a copy of the GNU General Public License
23 * along with this program; if not, write to the Free Software 23 * along with this program; if not, write to the Free Software
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA 24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
25 */ 25 */
26 #define _PURPLE_BUDDYICON_C_
27
26 #include "internal.h" 28 #include "internal.h"
27 #include "buddyicon.h" 29 #include "buddyicon.h"
28 #include "conversation.h" 30 #include "conversation.h"
29 #include "dbus-maybe.h" 31 #include "dbus-maybe.h"
30 #include "debug.h" 32 #include "debug.h"
952 } 954 }
953 955
954 return purple_buddy_icons_node_set_custom_icon(node, data, len); 956 return purple_buddy_icons_node_set_custom_icon(node, data, len);
955 } 957 }
956 958
957 #ifndef PURPLE_DISABLE_DEPRECATED
958 gboolean 959 gboolean
959 purple_buddy_icons_has_custom_icon(PurpleContact *contact) 960 purple_buddy_icons_has_custom_icon(PurpleContact *contact)
960 { 961 {
961 return purple_buddy_icons_node_has_custom_icon((PurpleBlistNode*)contact); 962 return purple_buddy_icons_node_has_custom_icon((PurpleBlistNode*)contact);
962 } 963 }
971 purple_buddy_icons_set_custom_icon(PurpleContact *contact, guchar *icon_data, 972 purple_buddy_icons_set_custom_icon(PurpleContact *contact, guchar *icon_data,
972 size_t icon_len) 973 size_t icon_len)
973 { 974 {
974 return purple_buddy_icons_node_set_custom_icon((PurpleBlistNode*)contact, icon_data, icon_len); 975 return purple_buddy_icons_node_set_custom_icon((PurpleBlistNode*)contact, icon_data, icon_len);
975 } 976 }
976 #endif
977 977
978 void 978 void
979 _purple_buddy_icon_set_old_icons_dir(const char *dirname) 979 _purple_buddy_icon_set_old_icons_dir(const char *dirname)
980 { 980 {
981 old_icons_dir = g_strdup(dirname); 981 old_icons_dir = g_strdup(dirname);