- A few additions and enhancements to the Install script.

- Removed the --disable-sound option to the configure script.

src/actions.c

@@ -47,6 +47,7 @@
 #include "appmenu.h"
 #include "winspector.h"
 #include "workspace.h"
+#include "wsound.h"
 
 #ifdef GNOME_STUFF
 # include "gnome.h"
@@ -55,9 +56,6 @@
 # include "kwm.h"
 #endif
 
-#ifdef WSOUND
-#include "wsound.h"
-#endif
 
 
 /****** Global Variables ******/
@@ -272,9 +270,7 @@ wShadeWindow(WWindow  *wwin)
 
     XLowerWindow(dpy, wwin->client_win);    
 
-#ifdef WSOUND
     wSoundPlay(WSOUND_SHADE);
-#endif
 
 #ifdef ANIMATIONS
     if (!wwin->screen_ptr->flags.startup && !wwin->flags.skip_next_animation
@@ -359,9 +355,7 @@ wUnshadeWindow(WWindow  *wwin)
     wwin->flags.mapped = 1;
     XMapWindow(dpy, wwin->client_win);
 
-#ifdef WSOUND
     wSoundPlay(WSOUND_UNSHADE);
-#endif
 
 #ifdef ANIMATIONS
     if (!wPreferences.no_animations && !wwin->flags.skip_next_animation) {
@@ -514,9 +508,7 @@ wMaximizeWindow(WWindow *wwin, int directions)
     wKWMSendEventMessage(wwin, WKWMChangedClient);
 #endif
 
-#ifdef WSOUND
     wSoundPlay(WSOUND_MAXIMIZE);
-#endif
 }
 
 
@@ -548,9 +540,7 @@ wUnmaximizeWindow(WWindow *wwin)
     wKWMSendEventMessage(wwin, WKWMChangedClient);
 #endif
 
-#ifdef WSOUND
     wSoundPlay(WSOUND_UNMAXIMIZE);
-#endif
 }
 
 #ifdef ANIMATIONS
@@ -969,9 +959,7 @@ wIconifyWindow(WWindow *wwin)
     unmapTransientsFor(wwin);
 
     if (present) {
-#ifdef WSOUND
 	wSoundPlay(WSOUND_ICONIFY);
-#endif
 
 	XUngrabPointer(dpy, CurrentTime);
 	wWindowUnmap(wwin);
@@ -1123,9 +1111,7 @@ wDeiconifyWindow(WWindow  *wwin)
 	XUnmapWindow(dpy, wwin->icon->core->window);
     }
 
-#ifdef WSOUND
     wSoundPlay(WSOUND_DEICONIFY);
-#endif
 
     /* if the window is in another workspace, do it silently */
 #ifdef ANIMATIONS
@@ -1241,9 +1227,7 @@ hideWindow(WIcon *icon, int icon_x, int icon_y, WWindow *wwin, int animate)
 
     wClientSetState(wwin, IconicState, icon->icon_win);
     flushExpose();
-#ifdef WSOUND
     wSoundPlay(WSOUND_HIDE);
-#endif
 #ifdef ANIMATIONS
     if (!wwin->screen_ptr->flags.startup && !wPreferences.no_animations &&
 	!wwin->flags.skip_next_animation && animate) {
@@ -1390,9 +1374,7 @@ unhideWindow(WIcon *icon, int icon_x, int icon_y, WWindow *wwin, int animate,
     wwin->flags.hidden=0;
     wwin->flags.mapped=1;
     
-#ifdef WSOUND
     wSoundPlay(WSOUND_UNHIDE);
-#endif
 #ifdef ANIMATIONS
     if (!wwin->screen_ptr->flags.startup && !wPreferences.no_animations 
 	&& animate) {

src/appicon.c

@@ -912,9 +912,7 @@ appIconMouseDown(WObjDescriptor *desc, XEvent *event)
 		    }
 		}
 
-#ifdef WSOUND
 		wSoundPlay(WSOUND_DOCK);
-#endif
             } else {
 		if (movingSingle) {
 		    /* move back to its place */

src/application.c

@@ -47,12 +47,8 @@
 #include "actions.h"
 #include "defaults.h"
 #include "workspace.h"
-
 #include "dock.h"
-
-#ifdef WSOUND
 #include "wsound.h"
-#endif
 
 
 /******** Global variables ********/
@@ -436,11 +432,8 @@ wApplicationCreate(WScreen *scr, Window main_window)
         if (!tmp)
 	    extractClientIcon(wapp->app_icon);
     }
-    
-    
-#ifdef WSOUND
+
     wSoundPlay(WSOUND_APPSTART);
-#endif
 
 #ifdef DEBUG
     printf("Created application for %x\n", (unsigned)main_window);
@@ -517,9 +510,7 @@ wApplicationDestroy(WApplication *wapp)
         wArrangeIcons(scr, True);
     }
 
-#ifdef WSOUND
     wSoundPlay(WSOUND_APPEXIT);
-#endif
 }
 
 

src/dialog.c

@@ -1319,7 +1319,7 @@ wShowInfoPanel(WScreen *scr)
 	strcat(buffer, " ");
     }
 
-    strcat(buffer, _("\nAdditional Support For: "));
+    strcat(buffer, _("\nAdditional support for: "));
     {
 	char *list[8];
 	char buf[80];
@@ -1337,9 +1337,6 @@ wShowInfoPanel(WScreen *scr)
 #ifdef OLWM_HINTS
 	list[j++] = "OLWM";
 #endif
-#ifdef WSOUND
-	list[j++] = _("Sound");
-#endif
 
 	buf[0] = 0;
 	for (i = 0; i < j; i++) {
@@ -1354,6 +1351,12 @@ wShowInfoPanel(WScreen *scr)
 	strcat(buffer, buf);
     }
 
+    if (wPreferences.no_sound) {
+        strcat(buffer, _("\nSound support disabled"));
+    } else {
+        strcat(buffer, _("\nSound support enabled"));
+    }
+
 
     panel->infoL = WMCreateLabel(panel->win);
     WMResizeWidget(panel->infoL, 350, 75);

src/dock.c

@@ -3874,19 +3874,13 @@ handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
 			if (aicon->icon->selected)
 			    wIconSelect(aicon->icon);
 
-#ifdef WSOUND
 			wSoundPlay(WSOUND_KABOOM);
-#endif
 			DoKaboom(scr,aicon->icon->core->window, x, y);
-#ifdef WSOUND
 		    } else {
-			    wSoundPlay(WSOUND_UNDOCK);
-#endif
-		    }
-#ifdef WSOUND
+                        wSoundPlay(WSOUND_UNDOCK);
+                    }
 		} else {
-			wSoundPlay(WSOUND_UNDOCK);
-#endif
+                    wSoundPlay(WSOUND_UNDOCK);
                 }
                 if (clip && clip->auto_raise_lower)
                     wDockLower(clip);

src/wsound.c

@@ -11,7 +11,6 @@
 #include "funcs.h"
 #include "wsound.h"
 
-#ifdef WSOUND
 
 
 
@@ -41,4 +40,4 @@ wSoundPlay(long event_sound)
     }
 }
 
-#endif /* WSOUND */
+