diff --git a/.cvsignore b/.cvsignore index fbababea..4fa6e089 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,7 +3,6 @@ aclocal.m4 configure config.log config.cache config.guess config.status config.sub libtool ltconfig ltmain.sh autom4te.cache -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt update WindowMaker*.tar.gz diff --git a/ChangeLog b/ChangeLog index 5f2a8511..119c4547 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,8 @@ Changes since version 0.80.2: - Fixed bug with scrolling menus introduced by the xinerama patch. - Fixed bug that could cause SIGSEGV by accessing beyond the end of text in a WINGs textfield widget. +- Fixed small memory leak in WINGs' font panel code. +- Fixed memory leak in WINGs' file panel code. Changes since version 0.80.1: diff --git a/WINGs/.cvsignore b/WINGs/.cvsignore index a43b43d8..342cebea 100644 --- a/WINGs/.cvsignore +++ b/WINGs/.cvsignore @@ -1,5 +1,4 @@ Makefile Makefile.in get-wings-flags get-wutil-flags .libs -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WINGs/ChangeLog b/WINGs/ChangeLog index 5073ef67..ba090fdc 100644 --- a/WINGs/ChangeLog +++ b/WINGs/ChangeLog @@ -55,6 +55,9 @@ Changes since wmaker 0.80.1: - Added WMSetTableViewHasHorizontalScroller() - Fixed bug that could cause SIGSEGV by accessing beyond the end of text in a WINGs textfield widget. +- Fixed small memory leak in the font panel code. +- Fixed call to qsort in WMSortArray. +- Fixed a memleak in the file panel. Changes since wmaker 0.80.0: diff --git a/WINGs/Documentation/.cvsignore b/WINGs/Documentation/.cvsignore index 9375a4f2..13311cca 100644 --- a/WINGs/Documentation/.cvsignore +++ b/WINGs/Documentation/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WINGs/Examples/.cvsignore b/WINGs/Examples/.cvsignore index 6358b0e3..6cd9f98b 100644 --- a/WINGs/Examples/.cvsignore +++ b/WINGs/Examples/.cvsignore @@ -1,5 +1,4 @@ Makefile Makefile.in connect server fontl puzzle UserTime.plist .libs -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WINGs/Extras/.cvsignore b/WINGs/Extras/.cvsignore index e443629c..6c0b229b 100644 --- a/WINGs/Extras/.cvsignore +++ b/WINGs/Extras/.cvsignore @@ -1,5 +1,4 @@ Makefile Makefile.in .libs test -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WINGs/Resources/.cvsignore b/WINGs/Resources/.cvsignore index 9375a4f2..13311cca 100644 --- a/WINGs/Resources/.cvsignore +++ b/WINGs/Resources/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WINGs/Tests/.cvsignore b/WINGs/Tests/.cvsignore index 293eeb36..1f808c75 100644 --- a/WINGs/Tests/.cvsignore +++ b/WINGs/Tests/.cvsignore @@ -1,5 +1,4 @@ Makefile Makefile.in testtext testcolorpanel testmywidget wmfile wmquery wtest .libs -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WINGs/array.c b/WINGs/array.c index f4ce06fc..fabc328a 100644 --- a/WINGs/array.c +++ b/WINGs/array.c @@ -274,7 +274,9 @@ WMCountInArray(WMArray *array, void *item) void WMSortArray(WMArray *array, WMCompareDataProc *comparer) { - qsort(array->items, array->itemCount, sizeof(void*), comparer); + if (array->itemCount > 1) { /* Don't sort empty or single element arrays */ + qsort(array->items, array->itemCount, sizeof(void*), comparer); + } } diff --git a/WINGs/po/.cvsignore b/WINGs/po/.cvsignore index 4030a36f..daf1ab50 100644 --- a/WINGs/po/.cvsignore +++ b/WINGs/po/.cvsignore @@ -1,5 +1,4 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt *.pot *.mo diff --git a/WINGs/wfilepanel.c b/WINGs/wfilepanel.c index c9b52220..0ac07ba2 100644 --- a/WINGs/wfilepanel.c +++ b/WINGs/wfilepanel.c @@ -548,12 +548,15 @@ listDirectoryOnColumn(WMFilePanel *panel, int column, char *path) DIR *dir; struct stat stat_buf; char pbuf[PATH_MAX+16]; + char *name; assert(column >= 0); assert(path != NULL); /* put directory name in the title */ - WMSetBrowserColumnTitle(bPtr, column, get_name_from_path(path)); + name = get_name_from_path(path); + WMSetBrowserColumnTitle(bPtr, column, name); + wfree(name); dir = opendir(path); diff --git a/WINGs/wfontpanel.c b/WINGs/wfontpanel.c index 62c6276f..5ee6bde8 100644 --- a/WINGs/wfontpanel.c +++ b/WINGs/wfontpanel.c @@ -831,15 +831,17 @@ getSelectedFont(FontPanel *panel, char buffer[], int bufsize) size = WMGetTextFieldText(panel->sizT); snprintf(buffer, bufsize, "-%s-%s-%s-%s-%s-%s-%s-*-*-*-*-*-%s-%s", - family->foundry, - family->name, - face->weight, - face->slant, - face->setWidth, - face->addStyle, - size, - family->registry, - family->encoding); + family->foundry, + family->name, + face->weight, + face->slant, + face->setWidth, + face->addStyle, + size, + family->registry, + family->encoding); + + wfree(size); } diff --git a/WPrefs.app/.cvsignore b/WPrefs.app/.cvsignore index 5ee6a0c3..d1a922a3 100644 --- a/WPrefs.app/.cvsignore +++ b/WPrefs.app/.cvsignore @@ -1,5 +1,4 @@ Makefile Makefile.in WPrefs .libs -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WPrefs.app/po/.cvsignore b/WPrefs.app/po/.cvsignore index 4030a36f..daf1ab50 100644 --- a/WPrefs.app/po/.cvsignore +++ b/WPrefs.app/po/.cvsignore @@ -1,5 +1,4 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt *.pot *.mo diff --git a/WPrefs.app/tiff/.cvsignore b/WPrefs.app/tiff/.cvsignore index 9375a4f2..13311cca 100644 --- a/WPrefs.app/tiff/.cvsignore +++ b/WPrefs.app/tiff/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WPrefs.app/xpm/.cvsignore b/WPrefs.app/xpm/.cvsignore index 9375a4f2..13311cca 100644 --- a/WPrefs.app/xpm/.cvsignore +++ b/WPrefs.app/xpm/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WindowMaker/.cvsignore b/WindowMaker/.cvsignore index 9375a4f2..13311cca 100644 --- a/WindowMaker/.cvsignore +++ b/WindowMaker/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WindowMaker/Backgrounds/.cvsignore b/WindowMaker/Backgrounds/.cvsignore index 9375a4f2..13311cca 100644 --- a/WindowMaker/Backgrounds/.cvsignore +++ b/WindowMaker/Backgrounds/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WindowMaker/Defaults/.cvsignore b/WindowMaker/Defaults/.cvsignore index e69a0da6..e8c23dac 100644 --- a/WindowMaker/Defaults/.cvsignore +++ b/WindowMaker/Defaults/.cvsignore @@ -1,4 +1,3 @@ Makefile Makefile.in WMState WMWindowAttributes WindowMaker WMRootMenu -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WindowMaker/IconSets/.cvsignore b/WindowMaker/IconSets/.cvsignore index b0bcbbfc..4b83e457 100644 --- a/WindowMaker/IconSets/.cvsignore +++ b/WindowMaker/IconSets/.cvsignore @@ -1,4 +1,3 @@ Makefile Makefile.in Default.iconset -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WindowMaker/Icons/.cvsignore b/WindowMaker/Icons/.cvsignore index 9375a4f2..13311cca 100644 --- a/WindowMaker/Icons/.cvsignore +++ b/WindowMaker/Icons/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WindowMaker/Pixmaps/.cvsignore b/WindowMaker/Pixmaps/.cvsignore index 9375a4f2..13311cca 100644 --- a/WindowMaker/Pixmaps/.cvsignore +++ b/WindowMaker/Pixmaps/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WindowMaker/Styles/.cvsignore b/WindowMaker/Styles/.cvsignore index 9375a4f2..13311cca 100644 --- a/WindowMaker/Styles/.cvsignore +++ b/WindowMaker/Styles/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/WindowMaker/Themes/.cvsignore b/WindowMaker/Themes/.cvsignore index 9375a4f2..13311cca 100644 --- a/WindowMaker/Themes/.cvsignore +++ b/WindowMaker/Themes/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/contrib/.cvsignore b/contrib/.cvsignore index 6b12b65e..7dbfcf03 100644 --- a/contrib/.cvsignore +++ b/contrib/.cvsignore @@ -1,4 +1,3 @@ Makefile Makefile.in WindowMaker.spec -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/doc/.cvsignore b/doc/.cvsignore index 9375a4f2..13311cca 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/doc/sk/.cvsignore b/doc/sk/.cvsignore index 9375a4f2..13311cca 100644 --- a/doc/sk/.cvsignore +++ b/doc/sk/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/plugins/.cvsignore b/plugins/.cvsignore index 51140e46..469c7b4a 100644 --- a/plugins/.cvsignore +++ b/plugins/.cvsignore @@ -1,8 +1,2 @@ -Makefile Makefile.in -aclocal.m4 -configure config.log config.cache config.guess config.status config.sub -libtool ltconfig ltmain.sh -.psrc .inslog2 tca.map tca.log -*.rpt -update update-autoconf +.psrc .inslog2 tca.map tca.log pchdir *.rpt libwmfun*.tar.gz diff --git a/plugins/libwmfun/.cvsignore b/plugins/libwmfun/.cvsignore index 8fc48cd4..26943889 100644 --- a/plugins/libwmfun/.cvsignore +++ b/plugins/libwmfun/.cvsignore @@ -2,5 +2,4 @@ Makefile Makefile.in *.lo *.la stamp-h stamp-h.in config.h config.h.in .libs -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/po/.cvsignore b/po/.cvsignore index 4030a36f..daf1ab50 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -1,5 +1,4 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt *.pot *.mo diff --git a/src/.cvsignore b/src/.cvsignore index 766b5aef..7219c77f 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -2,5 +2,4 @@ Makefile Makefile.in config.h config.h.in wconfig.h stamp-h stamp-h1 stamp-h.in .libs wmaker -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/test/.cvsignore b/test/.cvsignore index 522f6d25..7b774b97 100644 --- a/test/.cvsignore +++ b/test/.cvsignore @@ -1,5 +1,4 @@ Makefile Makefile.in wtest .libs -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/util/.cvsignore b/util/.cvsignore index 13399ab3..f1f2bdc4 100644 --- a/util/.cvsignore +++ b/util/.cvsignore @@ -2,5 +2,4 @@ Makefile Makefile.in wmsetup wmagnify wxcopy wxpaste wdwrite getstyle setstyle seticons geticonset wmsetbg wmaker.inst wdread wmchlocale .libs -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/wmlib/.cvsignore b/wmlib/.cvsignore index 9375a4f2..13311cca 100644 --- a/wmlib/.cvsignore +++ b/wmlib/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/wrlib/.cvsignore b/wrlib/.cvsignore index 2bec3668..ac2f7c64 100644 --- a/wrlib/.cvsignore +++ b/wrlib/.cvsignore @@ -2,5 +2,4 @@ Makefile Makefile.in *.lo *.la view testgrad testdraw testrot get-wraster-flags .libs -.psrc .inslog2 tca.map tca.log -*.rpt +.psrc .inslog2 tca.map tca.log pchdir *.rpt