File WSoundPrefs-1.1.1-noPropList.patch of Package wsndpref

--- wsoundprefs-1.1.1.orig/src/Imakefile
+++ wsoundprefs-1.1.1/src/Imakefile
@@ -7,16 +7,18 @@
 
 WSOUNDCFLAGS = `get-wsound-flags --cflags`
-WSOUNDLFLAGS = `get-wsound-flags --lflags`
+WSOUNDLFLAGS = `get-wsound-flags --ldflags`
 WSOUNDLIBS = `get-wsound-flags --libs`
 WRASTERCFLAGS = `get-wraster-flags --cflags`
-WRASTERLFLAGS = `get-wraster-flags --lflags`
+WRASTERLFLAGS = `get-wraster-flags --ldflags`
 WRASTERLIBS = `get-wraster-flags --libs`
-WINGSLIBS = -lWINGs -lPropList
+WINGSCFLAGS = `get-wings-flags --cflags`
+WINGSLFLAGS = `get-wings-flags --ldflags`
+WINGSLIBS = `get-wings-flags --libs`
 
-STD_INCLUDES = $(WRASTERCFLAGS) $(WSOUNDCFLAGS)
+STD_INCLUDES = $(WRASTERCFLAGS) $(WSOUNDCFLAGS) $(WINGSCFLAGS)
 DEPLIBS = $(DEPXLIB) 
 
-LOCAL_LIBRARIES =	$(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB)
+LOCAL_LIBRARIES =	$(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(WINGSLFLAGS) $(WINGSLIBS) $(EFENCELIB)
 
 LINTLIBS = $(LINTXLIB)
 
@@ -32,7 +35,7 @@
 
 ComplexProgramTarget(WSoundPrefs)
 
-InstallMultiple($(ICONS),$(BINDIR))
+InstallMultiple($(ICONS),$(APPDIR))
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
--- wsoundprefs-1.1.1.orig/src/PLFunctions.c
+++ wsoundprefs-1.1.1/src/PLFunctions.c
@@ -32,90 +32,90 @@
 #include "WSoundPrefs.h"
 #include "PLFunctions.h"
 
-extern proplist_t WMSoundDomain;
+extern WMPropList *WMSoundDomain;
 
 
-proplist_t
+WMPropList *
 GetObjectForKey(char *defaultName)
 {
-    proplist_t object = NULL;
-    proplist_t key = PLMakeString(defaultName);
+    WMPropList *object = NULL;
+    WMPropList *key = WMCreatePLString(defaultName);
 
-    object = PLGetDictionaryEntry(WMSoundDomain, key);
+    object = WMGetFromPLDictionary(WMSoundDomain, key);
 
-    PLRelease(key);
+    WMReleasePropList(key);
 
     return object;
 }
 
 
 void
-SetObjectForKey(proplist_t object, char *defaultName)
+SetObjectForKey(WMPropList *object, char *defaultName)
 {
-    proplist_t key = PLMakeString(defaultName);
+    WMPropList *key = WMCreatePLString(defaultName);
 
-    PLInsertDictionaryEntry(WMSoundDomain, key, object);
-    PLRelease(key);
+    WMPutInPLDictionary(WMSoundDomain, key, object);
+    WMReleasePropList(key);
 }
 
 
 void
 RemoveObjectForKey(char *defaultName)
 {
-    proplist_t key = PLMakeString(defaultName);
+    WMPropList *key = WMCreatePLString(defaultName);
     
-    PLRemoveDictionaryEntry(WMSoundDomain, key);
+    WMRemoveFromPLDictionary(WMSoundDomain, key);
     
-    PLRelease(key);
+    WMReleasePropList(key);
 }
 
 
 char*
 GetStringForKey(char *defaultName)
 {
-    proplist_t val;
+    WMPropList *val;
     
     val = GetObjectForKey(defaultName);
 
     if (!val)
 	return NULL;
 
-    if (!PLIsString(val))
+    if (!WMIsPLString(val))
 	return NULL;
 
-    return PLGetString(val);
+    return WMGetFromPLString(val);
 }
 
 
 
-proplist_t
+WMPropList *
 GetArrayForKey(char *defaultName)
 {
-    proplist_t val;
+    WMPropList *val;
     
     val = GetObjectForKey(defaultName);
     
     if (!val)
 	return NULL;
 
-    if (!PLIsArray(val))
+    if (!WMIsPLArray(val))
 	return NULL;
 
     return val;
 }
 
 
-proplist_t
+WMPropList *
 GetDictionaryForKey(char *defaultName)
 {
-    proplist_t val;
+    WMPropList *val;
 
     val = GetObjectForKey(defaultName);
     
     if (!val)
 	return NULL;
 
-    if (!PLIsDictionary(val))
+    if (!WMIsPLDictionary(val))
 	return NULL;
 
     return val;
@@ -125,7 +125,7 @@
 int
 GetIntegerForKey(char *defaultName)
 {
-    proplist_t val;
+    WMPropList *val;
     char *str;
     int value;
 
@@ -134,10 +134,10 @@
     if (!val)
 	return 0;
 
-    if (!PLIsString(val))
+    if (!WMIsPLString(val))
 	return 0;
     
-    str = PLGetString(val);
+    str = WMGetFromPLString(val);
     if (!str)
 	return 0;
     
@@ -175,14 +175,14 @@
 void
 SetIntegerForKey(int value, char *defaultName)
 {
-    proplist_t object;
+    WMPropList *object;
     char buffer[128];
 
     sprintf(buffer, "%i", value);
-    object = PLMakeString(buffer);
+    object = WMCreatePLString(buffer);
  
     SetObjectForKey(object, defaultName);
-    PLRelease(object);
+    WMReleasePropList(object);
 }
 
 
@@ -190,23 +190,23 @@
 void
 SetStringForKey(char *value, char *defaultName)
 {
-    proplist_t object;
+    WMPropList *object;
 
-    object = PLMakeString(value);
+    object = WMCreatePLString(value);
  
     SetObjectForKey(object, defaultName);
-    PLRelease(object);
+    WMReleasePropList(object);
 }
 
 
 void
 SetBoolForKey(Bool value, char *defaultName)
 {
-    static proplist_t yes = NULL, no = NULL;
+    static WMPropList *yes = NULL, *no = NULL;
 
     if (!yes) {
-	yes = PLMakeString("YES");
-	no = PLMakeString("NO");
+	yes = WMCreatePLString("YES");
+	no = WMCreatePLString("NO");
     }
 
     SetObjectForKey(value ? yes : no, defaultName);
--- wsoundprefs-1.1.1.orig/src/PLFunctions.h
+++ wsoundprefs-1.1.1/src/PLFunctions.h
@@ -35,12 +35,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <proplist.h>
+#include <WINGs/WINGs.h>
 
 
-proplist_t GetObjectForKey(char *defaultName);
+WMPropList *GetObjectForKey(char *defaultName);
 
-void SetObjectForKey(proplist_t object, char *defaultName);
+void SetObjectForKey(WMPropList *object, char *defaultName);
 
 void RemoveObjectForKey(char *defaultName);
 
--- wsoundprefs-1.1.1.orig/src/SoundEvents.c
+++ wsoundprefs-1.1.1/src/SoundEvents.c
@@ -50,7 +50,7 @@
 	NULL
 };
 
-extern proplist_t WMSoundDomain;
+extern WMPropList *WMSoundDomain;
 
 static char* expandSoundPath (WMWidget *w, void *data, char* file);
 static char* getPathFromName (char *name);
@@ -159,6 +159,7 @@
 	
 	text = WMGetTextFieldText(panel->sndfileT);
 	
+	if (!strcmp((char *)text, "") == 0) {
 	soundfile = expandSoundPath(w, data, text);
 	if ((SPlaySound(soundfile) == -1)) {
 		if (SErrorCode == SERR_NOSERVER) {
@@ -169,13 +170,14 @@
 				swarning(SMessageForError(SErrorCode));
 
 			WMSoundDBLoaded = False;
-			PLRelease(WMSoundDB);
+			WMReleasePropList(WMSoundDB);
 		}
 		else
 			swarning(SMessageForError(SErrorCode));
 	}
 
 	free(soundfile);
+	}
 }
 
 void
@@ -195,9 +197,9 @@
 	char		path[PATH_MAX] = "\0";
 	char		*spath = NULL;
 	
-	WMSetButtonEnabled(panel->sndbrowseB, NO);
-	WMSetButtonEnabled(panel->sndsetloadB, NO);
-	WMSetButtonEnabled(panel->sndsetsaveB, NO);
+	WMSetButtonEnabled(panel->sndbrowseB, False);
+	WMSetButtonEnabled(panel->sndsetloadB, False);
+	WMSetButtonEnabled(panel->sndsetsaveB, False);
 	
 	if ((strcmp(panel->lastBrowseDir,"\0") == 0)) {
 		strcpy(path, wexpandpath("~/GNUstep/Library/WindowMaker/Sounds"));
@@ -210,8 +212,8 @@
 	}
 	
 	browseP = WMGetOpenPanel(WMWidgetScreen(w));
-	WMSetFilePanelCanChooseDirectories(browseP, NO);
-	WMSetFilePanelCanChooseFiles(browseP, YES);
+	WMSetFilePanelCanChooseDirectories(browseP, False);
+	WMSetFilePanelCanChooseFiles(browseP, True);
 	if (WMRunModalFilePanelForDirectory(browseP, panel->win, spath , NULL, NULL)) {
 		char *filename;
 		filename = WMGetFilePanelFileName(browseP);
@@ -223,9 +225,9 @@
 	}
 	WMFreeFilePanel(browseP);
 
-	WMSetButtonEnabled(panel->sndbrowseB, YES);
-	WMSetButtonEnabled(panel->sndsetloadB, YES);
-	WMSetButtonEnabled(panel->sndsetsaveB, YES);
+	WMSetButtonEnabled(panel->sndbrowseB, True);
+	WMSetButtonEnabled(panel->sndsetloadB, True);
+	WMSetButtonEnabled(panel->sndsetsaveB, True);
 	free(spath);
 }
 
@@ -234,13 +236,13 @@
 {
 	Panel		*panel = (Panel*)data;
 	WMOpenPanel	*loadP;
-	proplist_t	newset;
+	WMPropList	*newset;
 	char		path[PATH_MAX] = "\0";
 	char		*spath = NULL;
 	
-	WMSetButtonEnabled(panel->sndsetloadB, NO);
-	WMSetButtonEnabled(panel->sndbrowseB, NO);
-	WMSetButtonEnabled(panel->sndsetsaveB, NO);
+	WMSetButtonEnabled(panel->sndsetloadB, False);
+	WMSetButtonEnabled(panel->sndbrowseB, False);
+	WMSetButtonEnabled(panel->sndsetsaveB, False);
 	
 	if ((strcmp(panel->lastLoadDir,"\0") == 0)) {
 		strcpy(path, wexpandpath("~/GNUstep/Library/WindowMaker/SoundSets"));
@@ -253,30 +255,30 @@
 	}
 	
 	loadP = WMGetOpenPanel(WMWidgetScreen(w));
-	WMSetFilePanelCanChooseDirectories(loadP, NO);
-	WMSetFilePanelCanChooseFiles(loadP, YES);
+	WMSetFilePanelCanChooseDirectories(loadP, False);
+	WMSetFilePanelCanChooseFiles(loadP, True);
 	if (WMRunModalFilePanelForDirectory(loadP, panel->win, spath , NULL, NULL)) {
 		char *filename;
 		filename = WMGetFilePanelFileName(loadP);
 		
 		strcpy(panel->lastLoadDir,(getPathFromName(filename)));
-		newset = PLGetProplistWithPath(filename);
+		newset = WMReadPropListFromFile(filename);
 		
 		if(!newset)
 			WMRunAlertPanel(WMWidgetScreen(w), panel->win, _("Error"),
 					_("Could not load specified SoundSet"), _("OK"), NULL, NULL);
 		else {
-			PLMergeDictionaries(WMSoundDomain,newset);
+			WMMergePLDictionaries(WMSoundDomain, newset, False);
 			WMSetTextFieldText(panel->sndfileT, GetStringForKey(eventkey[WMGetPopUpButtonSelectedItem(panel->sndevntP)]));
 		}
-		PLRelease(newset);
+		WMReleasePropList(newset);
 		free(filename);
 	}
 	WMFreeFilePanel(loadP);
 	
-	WMSetButtonEnabled(panel->sndsetloadB, YES);
-	WMSetButtonEnabled(panel->sndbrowseB, YES);
-	WMSetButtonEnabled(panel->sndsetsaveB, YES);
+	WMSetButtonEnabled(panel->sndsetloadB, True);
+	WMSetButtonEnabled(panel->sndbrowseB, True);
+	WMSetButtonEnabled(panel->sndsetsaveB, True);
 	
 	free(spath);
 }
@@ -286,15 +288,15 @@
 {
 	Panel		*panel = (Panel*)data;
 	WMSavePanel	*saveP;
-	proplist_t	newset, key, val;
+	WMPropList	*newset, *key, *val;
 	char		path[PATH_MAX] = "\0";
 	char		*spath = NULL;
 	FILE		*file;
 	int		i;
 	
-	WMSetButtonEnabled(panel->sndbrowseB, NO);
-	WMSetButtonEnabled(panel->sndsetloadB, NO);
-	WMSetButtonEnabled(panel->sndsetsaveB, NO);
+	WMSetButtonEnabled(panel->sndbrowseB, False);
+	WMSetButtonEnabled(panel->sndsetloadB, False);
+	WMSetButtonEnabled(panel->sndsetsaveB, False);
 	
 	if ((strcmp(panel->lastSaveDir,"\0") == 0)) {
 		strcpy(path, wexpandpath("~/GNUstep/Library/WindowMaker/SoundSets"));
@@ -307,8 +309,8 @@
 	}
 	
 	saveP = WMGetSavePanel(WMWidgetScreen(w));
-	WMSetFilePanelCanChooseDirectories(saveP, NO);
-	WMSetFilePanelCanChooseFiles(saveP, YES);
+	WMSetFilePanelCanChooseDirectories(saveP, False);
+	WMSetFilePanelCanChooseFiles(saveP, True);
 	if (WMRunModalFilePanelForDirectory(saveP, panel->win, spath , NULL, NULL)) {
 		char *filename = NULL;
 		filename = WMGetFilePanelFileName(saveP);
@@ -316,17 +318,19 @@
 		
 		file = fopen (filename, "w+");
 		if (file) {
-			newset = PLMakeDictionaryFromEntries(NULL,NULL,NULL);
+			newset = WMCreatePLDictionary(NULL,NULL,NULL);
+			key = NULL;
 			
 			for(i=0;eventkey[i]!="UserDefined";i++) {
-				key = PLMakeString(eventkey[i]);
-				val = PLGetDictionaryEntry(WMSoundDomain,key);
-				if(val) PLInsertDictionaryEntry(newset,key,val);
+				key = WMCreatePLString(eventkey[i]);
+				val = WMGetFromPLDictionary(WMSoundDomain,key);
+				if(val) WMPutInPLDictionary(newset,key,val);
 			}
-			PLRelease(key);
+			if (key)
+				WMReleasePropList(key);
 			
-			fprintf (file, PLGetDescriptionIndent(newset,0));
-			PLRelease(newset);
+			fprintf (file, WMGetPropListDescription(newset,0));
+			WMReleasePropList(newset);
 			fclose (file);
 		}
 		else
@@ -337,9 +341,9 @@
 	}
 	WMFreeFilePanel(saveP);
 	
-	WMSetButtonEnabled(panel->sndbrowseB, YES);
-	WMSetButtonEnabled(panel->sndsetloadB, YES);
-	WMSetButtonEnabled(panel->sndsetsaveB, YES);
+	WMSetButtonEnabled(panel->sndbrowseB, True);
+	WMSetButtonEnabled(panel->sndsetloadB, True);
+	WMSetButtonEnabled(panel->sndsetsaveB, True);
 	free(spath);
 }
 
@@ -352,11 +356,10 @@
 expandSoundPath (WMWidget *w, void *data, char* file)
 {
 	Panel *panel = (Panel*)data;
-	proplist_t array, val;
+	WMPropList *array, *val;
 	int nr_elem;
 	int i = 0;
 	char *path;
-	char *tmp;
 	
 	assert(file!=NULL);
 	
@@ -365,22 +368,15 @@
 	}
 	
 	array = GetObjectForKey("SoundPath");
-	nr_elem = PLGetNumberOfElements(array);
+	nr_elem = WMGetPropListItemCount(array);
 	
 	while (i < nr_elem) {
-		val = PLGetArrayElement(array, i);
-		path = wexpandpath(PLGetString(val));
+		val = WMGetFromPLArray(array, i);
+		path = wexpandpath(WMGetFromPLString(val));
 		
-		if ((path+strlen(path)-1) != "/") {
-			tmp = wstrappend(path, "/");
-			if (path)
-				free(path);
-			path = tmp;
-		}
-		tmp = wstrappend(path, file);
-		if (path)
-			free(path);
-		path = tmp;
+		if ((path+strlen(path)-1) != "/")
+			path = wstrappend(path, "/");
+		path = wstrappend(path, file);
 		
 		if (access(path, F_OK) == 0) {
 #ifdef DEBUG
@@ -422,7 +418,7 @@
 static char*
 checkSoundPath(char* file)
 {
-	proplist_t	array, val;
+	WMPropList	*array, *val;
 	int		nr_elem;
 	int		i = 0;
 	char		*path;
@@ -431,11 +427,11 @@
 	assert(file!=NULL);
 	
 	array = GetObjectForKey("SoundPath");
-	nr_elem = PLGetNumberOfElements(array);
+	nr_elem = WMGetPropListItemCount(array);
 	
 	while (i < nr_elem) {
-		val = PLGetArrayElement(array, i);
-		path = wexpandpath(PLGetString(val));
+		val = WMGetFromPLArray(array, i);
+		path = wexpandpath(WMGetFromPLString(val));
 		
 		if ((path+strlen(path)-1) != "/") {
 			tmp = wstrappend(path, "/");
--- wsoundprefs-1.1.1.orig/src/SoundPaths.c
+++ wsoundprefs-1.1.1/src/SoundPaths.c
@@ -30,7 +30,7 @@
 #include "WSoundPrefs.h"
 #include "SoundPaths.h"
 
-extern proplist_t WMSoundDomain;
+extern WMPropList *WMSoundDomain;
 
 static void addPathToList(WMList *list, int index, char *path);
 
@@ -62,19 +62,19 @@
 void
 setSoundPathData(Panel *panel)
 {
-	proplist_t	array, val;
+	WMPropList	*array, *val;
 	int		i;
 	
 	array = GetObjectForKey("SoundPath");
-	if (!array || !PLIsArray(array)) {
+	if (!array || !WMIsPLArray(array)) {
 		if (array)
 			wwarning(_("bad value in option SoundPath. Using default path list"));
 		addPathToList(panel->sndL, -1, "~/GNUstep/Library/WindowMaker/Sounds");
-		addPathToList(panel->sndL, -1, "/usr/local/share/WindowMaker/Sounds");
+		addPathToList(panel->sndL, -1, "/usr/share/WindowMaker/Sounds");
 	} else {
-		for (i=0; i<PLGetNumberOfElements(array); i++) {
-			val = PLGetArrayElement(array, i);
-			addPathToList(panel->sndL, -1, PLGetString(val));
+		for (i=0; i<WMGetPropListItemCount(array); i++) {
+			val = WMGetFromPLArray(array, i);
+			addPathToList(panel->sndL, -1, WMGetFromPLString(val));
 		}
 	}
 }
@@ -82,19 +82,19 @@
 void
 setSoundSetPathData(Panel *panel)
 {
-	proplist_t	array, val;
+	WMPropList	*array, *val;
 	int		i;
 	
 	array = GetObjectForKey("SoundSetPath");
-	if (!array || !PLIsArray(array)) {
+	if (!array || !WMIsPLArray(array)) {
 		if (array)
 			wwarning(_("bad value in option SoundSetPath. Using default path list"));
 		addPathToList(panel->sndsetL, -1, "~/GNUstep/Library/WindowMaker/SoundSets");
-		addPathToList(panel->sndsetL, -1, "/usr/local/share/WindowMaker/SoundSets");
+		addPathToList(panel->sndsetL, -1, "/usr/share/WindowMaker/SoundSets");
 	} else {
-		for (i=0; i<PLGetNumberOfElements(array); i++) {
-			val = PLGetArrayElement(array, i);
-			addPathToList(panel->sndsetL, -1, PLGetString(val));
+		for (i=0; i<WMGetPropListItemCount(array); i++) {
+			val = WMGetFromPLArray(array, i);
+			addPathToList(panel->sndsetL, -1, WMGetFromPLString(val));
 		}
 	}
 }
@@ -140,7 +140,7 @@
 				
 				if (w == panel->sndaB)
 					lPtr = panel->sndL;
-				else if (w == panel->sndsetaB)
+				else //if (w == panel->sndsetaB)
 					lPtr = panel->sndsetL;
 				
 				i = WMGetListSelectedItemRow(lPtr);
--- wsoundprefs-1.1.1.orig/src/SystemInfo.c
+++ wsoundprefs-1.1.1/src/SystemInfo.c
@@ -32,8 +32,6 @@
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <pwd.h>
-#include <WINGs.h>
-#include <WUtil.h>
 
 #include "WSoundPrefs.h"
 #include "SystemInfo.h"
--- wsoundprefs-1.1.1.orig/src/WSoundPrefs.c
+++ wsoundprefs-1.1.1/src/WSoundPrefs.c
@@ -40,7 +40,7 @@
 char*	locateImage(char *name);
 Bool	isFormatSupported(char *format);
 
-proplist_t WMSoundDomain = NULL;
+WMPropList *WMSoundDomain = NULL;
 
 /* ------------------------------------------------------------------------- */
 
@@ -48,7 +48,7 @@
 quit(WMWidget *w, void *data)
 {
 	if (WMSoundDomain)
-		PLRelease(WMSoundDomain);
+		WMReleasePropList(WMSoundDomain);
 
 	exit(0);
 }
@@ -57,28 +57,30 @@
 save(WMWidget *w, void *data)
 {
 	Panel		*panel = WMGetHangedData(w);
-	proplist_t	list;
-	proplist_t	tmp;
+	WMPropList	*list;
+	WMPropList	*tmp;
 	int		i;
 	char		*p;
 	
-	list = PLMakeArrayFromElements(NULL, NULL);
+	list = WMCreatePLArray(NULL, NULL);
 	for (i = 0; i < WMGetListNumberOfRows(panel->sndL); i++) {
 		p = WMGetListItem(panel->sndL, i)->text;
-		tmp = PLMakeString(p);
-		PLAppendArrayElement(list, tmp);
+		tmp = WMCreatePLString(p);
+		WMAddToPLArray(list, tmp);
 	}
 	SetObjectForKey(list, "SoundPath");
 	
-	list = PLMakeArrayFromElements(NULL, NULL);
+	list = WMCreatePLArray(NULL, NULL);
 	for (i = 0; i < WMGetListNumberOfRows(panel->sndsetL); i++) {
 		p = WMGetListItem(panel->sndsetL, i)->text;
-		tmp = PLMakeString(p);
-		PLAppendArrayElement(list, tmp);
+		tmp = WMCreatePLString(p);
+		WMAddToPLArray(list, tmp);
 	}
 	SetObjectForKey(list, "SoundSetPath");
 
-	PLSave(WMSoundDomain, YES);
+	p = wdefaultspathfordomain("WMSound");
+	WMWritePropListToFile(WMSoundDomain, p, True);
+	free(p);
 }
 
 void
@@ -124,7 +126,7 @@
 	/* Main Window */
 	panel->win = WMCreateWindow(scr, "wsoundprefs");
 	WMResizeWidget(panel->win, 482, 268);
-	WMSetWindowTitle(panel->win, _("WMSound Server Preferences"));
+	WMSetWindowTitle(panel->win, _("WSoundServer Preferences"));
 	WMSetWindowCloseAction(panel->win, quit, NULL);
 	WMSetWindowMaxSize(panel->win, 482, 268);
 	WMSetWindowMinSize(panel->win, 482, 268);
@@ -189,6 +191,7 @@
 		WMResizeWidget(panel->sndevntL, 196, 60);
 		WMMoveWidget(panel->sndevntL, 8, 40);
 		WMSetLabelTextAlignment(panel->sndevntL, WACenter);
+		WMSetLabelWraps (panel->sndevntL, True);
 
 		WMMapSubwidgets(panel->sndevntF);
 		
@@ -269,6 +272,7 @@
 		WMResizeWidget(panel->sndsetsL, 108, 48);
 		WMMoveWidget(panel->sndsetsL, 112, 16);
 		WMSetLabelTextAlignment(panel->sndsetsL, WALeft);
+		WMSetLabelWraps (panel->sndsetsL, True);
 		WMSetLabelText(panel->sndsetsL, _("Load and save an entire soundset."));
 		
 		WMMapSubwidgets(panel->sndsetF);
@@ -290,6 +294,7 @@
 		WMResizeWidget(panel->devL, 212, 54);
 		WMMoveWidget(panel->devL, 8, 44);
 		WMSetLabelTextAlignment(panel->devL, WACenter);
+		WMSetLabelWraps (panel->devL, True);
 		WMSetLabelText(panel->devL, _("Specify the sound device that should be "
 					"used to play the sounds through."));
 		
@@ -502,15 +507,15 @@
 static void
 loadConfigurations(WMScreen *scr, WMWindow *mainw)
 {
-	proplist_t db;
+	WMPropList *db;
 	char *path;
 	char mbuf[1024];
 	
 	path = wdefaultspathfordomain("WMSound");
-	db = PLGetProplistWithPath(path);
+	db = WMReadPropListFromFile(path);
 	if (db) {
-		if (!PLIsDictionary(db)) {
-			PLRelease(db);
+		if (!WMIsPLDictionary(db)) {
+			WMReleasePropList(db);
 			db = NULL;
 			sprintf(mbuf, _("WMSound domain (%s) is corrupted!"), path);
 			WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
@@ -522,7 +527,7 @@
 	free(path);
 	
 	if (!db) {
-		db = PLMakeDictionaryFromEntries(NULL, NULL, NULL);
+		db = WMCreatePLDictionary(NULL, NULL, NULL);
 	}
 	
 	WMSoundDomain = db;
--- wsoundprefs-1.1.1.orig/src/WSoundPrefs.h
+++ wsoundprefs-1.1.1/src/WSoundPrefs.h
@@ -38,20 +38,17 @@
 
 #include <X11/Xlib.h>
 
-#include <proplist.h>
-
 #include <wraster.h>
 
-#include <WINGs.h>
-#include <WUtil.h>
+#include <WINGs/WINGs.h>
+#include <WINGs/WUtil.h>
 
 #include <wsound.h>
 
 #include "PLFunctions.h"
 
 #define WVERSION        "1.1.1"
-#define WMVERSION       "0.6x.x"
-
+#define WMVERSION       "0.7x.x"
 
 /* 
  * Needed for HAVE_LIBINTL_H
--- wsoundprefs-1.1.1.orig/src/xpm/Imakefile
+++ wsoundprefs-1.1.1/src/xpm/Imakefile
@@ -1,4 +1,5 @@
-XPMDIR = /Apps/WSoundPrefs.app/xpm/
+APPDIR = /usr/lib/GNUstep/Apps/WSoundPrefs.app
+XPMDIR = $(APPDIR)/xpm/
 
 XPMS = loadset.xpm saveset.xpm
 
--- wsoundprefs-1.1.1.orig/Imakefile
+++ wsoundprefs-1.1.1/Imakefile
@@ -6,15 +6,13 @@
 XCOMM Installation Path: $(PREFIX)/Apps/WSoundPrefs.app
 XCOMM -------------------------------------------------
 XCOMM PREFIX = /usr/GNUstep/Local
-PREFIX = /usr/local/GNUstep
-
+BINDIR = /usr/bin
+APPDIR = /usr/lib/GNUstep/Apps/WSoundPrefs.app
 
 XCOMM CDEBUGFLAGS = -Wall -ggdb -DDEBUG
-CDEBUGFLAGS ?= -O2 -m486 
+CDEBUGFLAGS ?= -g -O2 -Wall
 
 SUBDIRS = src
-
-DESTDIR = $(PREFIX)
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))