Mercurial > pidgin.yaz
changeset 16618:7135dd81991c
merge of '8bc9a8784cf40932a34e08e80f0d6585812b985a'
and 'a35e9c6965a0723281ab3a62044581a55d2e59a2'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Sun, 29 Apr 2007 01:10:48 +0000 |
parents | 4eb08fcc16d8 (current diff) ee8bb9b5acb8 (diff) |
children | bb5c527cf143 |
files | libpurple/buddyicon.c |
diffstat | 3 files changed, 158 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Sun Apr 29 01:10:33 2007 +0000 +++ b/Makefile.am Sun Apr 29 01:10:48 2007 +0000 @@ -17,7 +17,8 @@ pidgin.apspec.in \ pidgin.spec.in \ pidgin.desktop.in \ - po/Makefile.mingw + po/Makefile.mingw \ + valgrind-suppressions noinst_HEADERS = config.h
--- a/libpurple/buddyicon.c Sun Apr 29 01:10:33 2007 +0000 +++ b/libpurple/buddyicon.c Sun Apr 29 01:10:48 2007 +0000 @@ -1124,7 +1124,8 @@ g_direct_hash, g_direct_equal, NULL, (GFreeFunc)g_hash_table_destroy); - icon_data_cache = g_hash_table_new(g_str_hash, g_str_equal); + icon_data_cache = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, NULL); icon_file_cache = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); pointer_icon_cache = g_hash_table_new(g_direct_hash, g_direct_equal);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/valgrind-suppressions Sun Apr 29 01:10:48 2007 +0000 @@ -0,0 +1,154 @@ +{ + X oddness 1 + Memcheck:Param + write(buf) + fun:__write_nocancel + fun:_X11TransWrite + obj:/usr/X11R6/lib/libX11.so.6.2 + fun:_XReply +} +{ + NSS + Memcheck:Cond + obj:/usr/lib/libsoftokn3.so + obj:/usr/lib/libsoftokn3.so + obj:/usr/lib/libsoftokn3.so + obj:/usr/lib/libsoftokn3.so +} +{ + X oddness 2 + Memcheck:Param + writev(vector[...]) + fun:writev + obj:/usr/X11R6/lib/libX11.so.6.2 + fun:_X11TransWritev + fun:_XSend +} +{ + X oddness 3 + Memcheck:Cond + fun:XcursorImageHash + fun:XcursorNoticePutBitmap + fun:_XNoticePutBitmap + fun:XPutImage +} +{ + X oddness 4 + Memcheck:Param + write(buf) + fun:__write_nocancel + fun:_X11TransWrite + obj:/usr/X11R6/lib/libX11.so.6.2 + fun:XFlush +} +{ + X oddness 5 + Memcheck:Param + write(buf) + fun:__write_nocancel + fun:_X11TransWrite + obj:/usr/X11R6/lib/libX11.so.6.2 + fun:XDrawLine +} +{ + X oddness 6 + Memcheck:Param + write(buf) + fun:__write_nocancel + fun:_X11TransWrite + obj:/usr/X11R6/lib/libX11.so.6.2 + fun:_XEventsQueued +} +{ + File selector + Memcheck:Value4 + fun:_itoa_word + fun:_IO_vfprintf_internal + fun:_IO_vsprintf_internal + fun:_IO_sprintf +} +{ + File selector 2 + Memcheck:Param + write(buf) + fun:__write_nocancel + fun:_X11TransWrite + obj:/usr/X11R6/lib/libX11.so.6.2 + fun:XRenderComposite +} +{ + TCL leak + Memcheck:Leak + fun:malloc + fun:TclpAlloc + fun:Tcl_Alloc + fun:Tcl_StaticPackage +} +{ + FontConfig Maybe + Memcheck:Leak + fun:malloc + fun:FcStrCopy + fun:FcStrSetAdd + fun:FcLangSetCopy +} +{ + File selector 3 + Memcheck:Param + write(buf) + fun:__write_nocancel + fun:_X11TransWrite + obj:/usr/X11R6/lib/libX11.so.6.2 + fun:_XFlushGCCache +} +{ + File selector 4 + Memcheck:Param + write(buf) + fun:__write_nocancel + fun:_X11TransWrite + obj:/usr/X11R6/lib/libX11.so.6.2 + fun:XCreateGC +} +{ + Something else + Memcheck:Param + write(buf) + fun:__write_nocancel + fun:_X11TransWrite + obj:/usr/X11R6/lib/libX11.so.6.2 + fun:_XSetClipRectangles +} +{ + New conversation windows + Memcheck:Cond + obj:/usr/lib/libgtk-x11-2.0.so.0.400.14 + obj:/usr/lib/libgtk-x11-2.0.so.0.400.14 + obj:/usr/lib/libgtk-x11-2.0.so.0.400.14 + obj:/usr/lib/libgtk-x11-2.0.so.0.400.14 +} +{ + New conversation windows 2 + Memcheck:Cond + obj:/usr/lib/libgtk-x11-2.0.so.0.400.14 + obj:/usr/lib/libgtk-x11-2.0.so.0.400.14 + obj:/usr/lib/libgtk-x11-2.0.so.0.400.14 + obj:/usr/lib/libgobject-2.0.so.0.400.8 +} +{ + NSS Init + Memcheck:Leak + fun:malloc + fun:PR_Malloc + fun:PR_CreateStack + fun:_PR_InitFdCache + fun:_PR_InitIO + fun:_PR_ImplicitInitialization + fun:PR_Init + fun:rsa_nss_init + fun:GE_plugin_load + fun:gaim_plugin_load + fun:gaim_plugins_load_saved + fun:main +} +