- Fixed small memory leak in the WINGs' font panel code.

- Fixed call to qsort in WMSortArray.
- Fixed a memleak in the WINGs' file panel.

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

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:

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

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

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

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

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

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);
+    }
 }
 
 

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

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);
     

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);
 }