fixed misc bugs

WINGs/WUtil.h

@@ -366,7 +366,7 @@ WMBag *WMCreateTreeBagWithDestructor(void (*destructor)(void*));
 /* this is slow */
 /* erase will remove the element from the bag,
  * but will keep the index of the other elements unchanged */
-#define WMEraseFromBag(bag, index) bag->func.deleteFromBag(bag, index)
+#define WMEraseFromBag(bag, index) bag->func.eraseFromBag(bag, index)
 
 /* delete and remove will remove the elements and cause the elements
  * after them to decrement their indexes by 1 */

WINGs/wbrowser.c

@@ -457,7 +457,7 @@ WMInsertBrowserItem(WMBrowser *bPtr, int column, int row, char *text,
 
     if (column < 0 || column >= bPtr->columnCount)
 	return NULL;
-
+    
     item = WMInsertListItem(bPtr->columns[column], row, text);
     item->isBranch = isBranch;
 

WINGs/wlist.c

@@ -170,6 +170,8 @@ WMInsertListItem(WMList *lPtr, int row, char *text)
 	&& row >= 0)
 	lPtr->selectedItem++;
     
+    row = WMIN(row, WMGetBagItemCount(lPtr->items));
+    
     if (row < 0)
 	WMPutInBag(lPtr->items, item);
     else
@@ -203,7 +205,7 @@ WMRemoveListItem(WMList *lPtr, int row)
     } else if (lPtr->selectedItem > row) {
         lPtr->selectedItem--;
     }
-    
+
     if (row <= lPtr->topItem+lPtr->fullFitLines+lPtr->flags.dontFitAll)
 	lPtr->topItem--;
     if (lPtr->topItem < 0)
@@ -455,9 +457,7 @@ paintItem(List *lPtr, int index)
     int width, height, x, y;
     WMListItem *itemPtr;
 
-
     itemPtr = WMGetFromBag(lPtr->items, index);
-    
 
     width = lPtr->view->size.width - 2 - 19;
     height = lPtr->itemHeight;
@@ -486,8 +486,8 @@ paintItem(List *lPtr, int index)
 			  &rect);
     } else {
 	if (itemPtr->selected)
-	    XFillRectangle(scr->display, view->window, WMColorGC(scr->white), x, y,
-			   width, height);
+	    XFillRectangle(scr->display, view->window, WMColorGC(scr->white), 
+			   x, y, width, height);
 	else
 	    XClearArea(scr->display, view->window, x, y, width, height, False);
 
@@ -620,6 +620,8 @@ WMSelectListItem(WMList *lPtr, int row)
     else
         notify = 1;
 
+    assert(lPtr->selectedItem < WMGetBagItemCount(lPtr->items));
+    
     if (!lPtr->flags.allowMultipleSelection) {
 	/* unselect previous selected item */
 	if (lPtr->selectedItem >= 0) {

WPrefs.app/Configurations.c

@@ -336,8 +336,9 @@ createPanel(Panel *p)
 	    WMSetButtonImage(panel->oldsB, icon);
 	    WMReleasePixmap(icon);
 	}
+	free(path);
     }
-    
+
     WMGroupButtons(panel->newsB, panel->oldsB);
     
     WMMapSubwidgets(panel->titlF);

WPrefs.app/Menu.c

@@ -573,6 +573,21 @@ performCommand(WMWidget *w, void *data)
 	break;
     }
 
+
+    {
+	int i, j;
+	WMList *list;
+	
+	list = WMGetBrowserListInColumn(panel->browser, 0);
+	for (i = 0; i < WMGetListNumberOfRows(list); i++) {
+	    WMListItem *item =WMGetListItem(list, i);
+	    if (!item)
+		printf("%i empty\n", i);
+	    else
+		puts(item->text);
+	}
+	
+    }
     if (row>=0) row++;
     WMInsertBrowserItem(panel->browser, column, row, title, isMenu(menuItem));
     if (row<0)
@@ -580,6 +595,8 @@ performCommand(WMWidget *w, void *data)
     else
 	PLInsertArrayElement(menu, menuItem, row+1);
     free(title);
+    
+    
     panel->unsaved = 1;
     
     if (removed) {

WPrefs.app/WPrefs.h

@@ -43,7 +43,7 @@
 /****/
 
 #define WVERSION	"0.42"
-#define WMVERSION	"0.61.x"
+#define WMVERSION	"0.62.x"
 
 
 extern char *NOptionValueChanged;

WPrefs.app/Workspace.c

@@ -320,6 +320,7 @@ createPanel(Panel *p)
 	    WMSetButtonAltImage(panel->clipB, icon1);
 	    WMReleasePixmap(icon1);
 	}
+	free(path);
     }
     WMSetBalloonTextForView(_("Disable/enable the Clip (that thing with\n"
 			      "a paper clip icon)."),
@@ -332,7 +333,7 @@ createPanel(Panel *p)
     
     WMRealizeWidget(panel->frame);
     WMMapSubwidgets(panel->frame);
-    
+
     showData(panel);
 }
 

WPrefs.app/po/Makefile.in

@@ -120,7 +120,7 @@ DIST_COMMON =  README Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:

WPrefs.app/xmodifier.c

@@ -228,6 +228,8 @@ x_reset_modifier_mapping (Display *display)
   AltIndex    = alt_bit;
   ModeIndex   = mode_bit;
 
+  if (x_modifier_keymap != NULL)
+	XFreeModifiermap(x_modifier_keymap);
 }