diff -crN ./gnome-applets/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/Makefile.am
*** ./gnome-applets/Makefile.am	Mon Mar 10 18:45:31 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/Makefile.am	Tue Jul  8 13:57:23 2003
***************
*** 59,65 ****
  	$(panel_menu_SUBDIR)	\
  	omf-install	
  
! DIST_SUBDIRS = \
  	po		\
  	screen-exec	\
  	mixer		\
--- 59,66 ----
  	$(panel_menu_SUBDIR)	\
  	omf-install	
  
! # ?? : BV : removed the 2nd ans unuseful occurence of mini-commander
! #DIST_SUBDIRS = \
  	po		\
  	screen-exec	\
  	mixer		\
diff -crN ./gnome-applets/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/configure.in
*** ./gnome-applets/configure.in	Mon Mar 10 18:45:31 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/configure.in	Tue Jul  8 13:58:01 2003
***************
*** 185,190 ****
--- 185,193 ----
    *solaris*)
  	build_battstat_applet=no
  	;;
+   *aix*)
+ 	build_battstat_applet=no
+ 	;;
  esac
  
  AM_CONDITIONAL(BUILD_BATTSTAT_APPLET, test x$build_battstat_applet = xyes)
***************
*** 202,210 ****
          AC_CHECK_HEADERS(sys/audioio.h, [P_MIXER=mixer],[
            AC_CHECK_HEADERS(sys/audio.io.h, [P_MIXER=mixer],[
              AC_CHECK_HEADERS(sun/audioio.h, [P_MIXER=mixer],[
! 	      AC_CHECK_HEADERS(dmedia/audio.h, [P_MIXER=mixer]),]) ]) ]) ]) ]) ]) ])
  AC_SUBST(MIXER_LIBS)
  
  AM_CONDITIONAL(APPLET_MIXER, test "$P_MIXER" = "mixer")
  if test "$P_MIXER" != "mixer"; then
    AC_MSG_WARN([*** \`mixer' applet will not be built ***])
--- 205,226 ----
          AC_CHECK_HEADERS(sys/audioio.h, [P_MIXER=mixer],[
            AC_CHECK_HEADERS(sys/audio.io.h, [P_MIXER=mixer],[
              AC_CHECK_HEADERS(sun/audioio.h, [P_MIXER=mixer],[
! 	      AC_CHECK_HEADERS(dmedia/audio.h, [P_MIXER=mixer], [
!                 AC_CHECK_HEADERS(soundcard.h, [P_MIXER=mixer; MIXER_LIBS="-lossaudio"])]) ]) ]) ]) ]) ]) ]) ])
  AC_SUBST(MIXER_LIBS)
  
+ dnl Need NAS to control X/Terminal audio device
+ 
+ AC_ARG_ENABLE(nas,[  --enable-nas            use Network Audio System if available [default=no]], , enable_nas=no)
+ 
+ if test "x$enable_nas" = "xyes"; then
+   AC_PATH_XTRA
+   MIXER_LIBS="$MIXER_LIBS $X_PRE_LIBS $X_LIBS -lXau $X_EXTRA_LIBS"
+   AC_CHECK_LIB(audio, AuOpenServer, , AC_MSG_ERROR([Could not find libaudio for NAS support]), $X_PRE_LIBS $X_LIBS -lXau $X_EXTRA_LIBS)
+   AC_CHECK_HEADERS(audio/audiolib.h, , AC_MSG_ERROR([Could not find header file for NAS support]))
+   P_MIXER=mixer
+ fi
+ 
  AM_CONDITIONAL(APPLET_MIXER, test "$P_MIXER" = "mixer")
  if test "$P_MIXER" != "mixer"; then
    AC_MSG_WARN([*** \`mixer' applet will not be built ***])
diff -crN ./gnome-applets/geyes/docs/C/geyes-C.omf /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/geyes/docs/C/geyes-C.omf
*** ./gnome-applets/geyes/docs/C/geyes-C.omf	Mon Mar 10 18:45:40 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/geyes/docs/C/geyes-C.omf	Tue Jul  8 13:58:38 2003
***************
*** 18,26 ****
      <date>
        2002-08-01
      </date>
!     <version identifier="2.3" date="2002-01-22" description="Updated for GNOME 
!     2.2, program version 2.1.3"/>
!     <subject category="GNOME|Applets|Amusements"/>
      <description>
        User manual for Geyes Applet. 
      </description>
--- 18,25 ----
      <date>
        2002-08-01
      </date>
!     <version identifier="2.3" date="2002-01-22" description="Updated for GNOME 2.2, program version 2.1.3"/>
!     <subject category="GNOME|Applets|Amusement"/>
      <description>
        User manual for Geyes Applet. 
      </description>
***************
*** 33,36 ****
      <relation seriesid="22069bfa-40e7-11d6-916c-fee2e30f369"/>
      <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/>
    </resource>
! </omf>
\ No newline at end of file
--- 32,35 ----
      <relation seriesid="22069bfa-40e7-11d6-916c-fee2e30f369"/>
      <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/>
    </resource>
! </omf>
diff -crN ./gnome-applets/geyes/themes/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/geyes/themes/Makefile.am
*** ./gnome-applets/geyes/themes/Makefile.am	Tue Jul  8 13:27:23 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/geyes/themes/Makefile.am	Tue Jul  8 13:59:09 2003
***************
*** 1,37 ****
- #SUBDIRS = Default Default-tiny Bizarre Bloodshot Horrid
- 
  Defaultdir = $(datadir)/geyes/Default
! Default_DATA =
! 
! Default_tinydir = $(datadir)/geyes/Default-tiny
! Default_tiny_DATA =
! 
! Bizarredir = $(datadir)/geyes/Bizarre
! Bizarre_DATA =
! 
! Bloodshotdir = $(datadir)/geyes/Bloodshot
! Bloodshot_DATA =
! 
! Horriddir = $(datadir)/geyes/Horrid
! Horrid_DATA =
! 
! geyesdir = $(datadir)/geyes
! geyes_DATA = \
  	Default/config				\
  	Default/Default-eye.png			\
! 	Default/Default-pupil.png		\
  	Default-tiny/config			\
  	Default-tiny/Default-tiny-eye.png	\
! 	Default-tiny/Default-tiny-pupil.png	\
  	Bizarre/config				\
  	Bizarre/Bizarre-eye.png			\
! 	Bizarre/Bizarre-pupil.png		\
  	Bloodshot/config			\
  	Bloodshot/Bloodshot-eye.png		\
! 	Bloodshot/Bloodshot-pupil.png		\
  	Horrid/config				\
  	Horrid/horrid_eye.png			\
  	Horrid/horrid_pupil.png
  
! EXTRA_DIST = $(geyes_DATA)
  
--- 1,34 ----
  Defaultdir = $(datadir)/geyes/Default
! Default_DATA =\
  	Default/config				\
  	Default/Default-eye.png			\
! 	Default/Default-pupil.png
! 
! Default_tinydir = $(datadir)/geyes/Default-tiny
! Default_tiny_DATA = \
  	Default-tiny/config			\
  	Default-tiny/Default-tiny-eye.png	\
! 	Default-tiny/Default-tiny-pupil.png
! 
! Bizarredir = $(datadir)/geyes/Bizarre
! Bizarre_DATA = \
  	Bizarre/config				\
  	Bizarre/Bizarre-eye.png			\
! 	Bizarre/Bizarre-pupil.png
! 
! Bloodshotdir = $(datadir)/geyes/Bloodshot
! Bloodshot_DATA = \
  	Bloodshot/config			\
  	Bloodshot/Bloodshot-eye.png		\
! 	Bloodshot/Bloodshot-pupil.png
! 
! Horriddir = $(datadir)/geyes/Horrid
! Horrid_DATA = \
  	Horrid/config				\
  	Horrid/horrid_eye.png			\
  	Horrid/horrid_pupil.png
  
! geyesdir = $(datadir)/geyes
! geyes_DATA = 
  
+ EXTRA_DIST = $(geyes_DATA)
diff -crN ./gnome-applets/gtik/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gtik/Makefile.am
*** ./gnome-applets/gtik/Makefile.am	Mon Mar 10 18:45:49 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gtik/Makefile.am	Tue Jul  8 14:00:09 2003
***************
*** 1,13 ****
  SUBDIRS = access help
  
! INCLUDES = \
! 	-I$(srcdir) \
! 	-I$(top_srcdir)/gtik/access \
! 	-I$(top_srcdir)/screen-exec \
! 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
! 	$(GNOME_APPLETS_CFLAGS)
! 	$(GNOME_VFS_APPLETS_CFLAGS) \
! 	-DGTIK_APPLET_NAME=\"gtik2_applet\"
  
  libexec_PROGRAMS = gtik2_applet2
  
--- 1,9 ----
  SUBDIRS = access help
  
! INCLUDES =  -I$(srcdir)  -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
! 		 $(GNOME_APPLETS_CFLAGS) $(GNOME_VFS_APPLETS_CFLAGS) \
! 		 -DGTIK_APPLET_NAME=\"gtik2_applet\" \
! 		 -I access/ -I$(srcdir)/access/ -I$(top_srcdir)/screen-exec
  
  libexec_PROGRAMS = gtik2_applet2
  
diff -crN ./gnome-applets/gtik/access/accessibledrawingarea.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gtik/access/accessibledrawingarea.c
*** ./gnome-applets/gtik/access/accessibledrawingarea.c	Mon Mar 10 18:45:47 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gtik/access/accessibledrawingarea.c	Tue Jul  8 14:00:43 2003
***************
*** 210,217 ****
--- 210,221 ----
  	g_free (text_string);
  	g_free (utf8);
  
+ 	/* ?? BV : changed the last two params 
   	return gail_text_util_get_substring (access_draw_area->textutil,
  				&start_pos, &end_pos);
+ 	*/
+  	return gail_text_util_get_substring (access_draw_area->textutil,
+ 				start_pos, end_pos);
  }
  
  static gchar*
diff -crN ./gnome-applets/gweather/gweather-pref.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gweather/gweather-pref.c
*** ./gnome-applets/gweather/gweather-pref.c	Mon Mar 10 18:45:51 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gweather/gweather-pref.c	Tue Jul  8 14:02:20 2003
***************
*** 1,4 ****
- /* $Id: gweather-pref.c,v 1.51 2002/12/08 23:48:29 kmaraas Exp $ */
  
  /*
   *  Papadimitriou Spiros <spapadim+@cs.cmu.edu>
--- 1,3 ----
***************
*** 35,41 ****
  {
      COL_LOC = 0,
      COL_POINTER,
!     NUM_COLUMNS,
  }; 
  
  
--- 34,40 ----
  {
      COL_LOC = 0,
      COL_POINTER,
!     NUM_COLUMNS
  }; 
  
  
diff -crN ./gnome-applets/mixer/mixer.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/mixer/mixer.c
*** ./gnome-applets/mixer/mixer.c	Mon Mar 10 18:45:57 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/mixer/mixer.c	Tue Jul  8 14:02:50 2003
***************
*** 73,78 ****
--- 73,81 ----
  #elif HAVE_DMEDIA_AUDIO_H
  #define IRIX_API
  #include <dmedia/audio.h>
+ #elif HAVE_AUDIO_AUDIOLIB_H
+ #include <audio/audiolib.h>
+ #define NAS_API
  #else
  #error No soundcard defenition!
  #endif /* SOUNDCARD_H */
***************
*** 86,91 ****
--- 89,97 ----
  #ifdef IRIX_API
  #define VOLUME_MAX 255
  #endif
+ #ifdef NAS_API
+ #define VOLUME_MAX 100
+ #endif
  
  #define VOLUME_STOCK_MUTE             "volume-mute"
  #define VOLUME_STOCK_ZERO	      "volume-zero"
***************
*** 137,142 ****
--- 143,151 ----
  
  void add_atk_namedesc (GtkWidget *widget, const gchar *name, const gchar *desc);
  
+ #ifdef NAS_API
+ AuServer* aud = NULL;
+ #endif /* NAS_API */
  static gint mixerfd = -1;
  static gchar *run_mixer_cmd = NULL;
  
***************
*** 166,171 ****
--- 175,183 ----
  openMixer(const gchar *device_name ) 
  {
  	gint res, ver;
+ #ifdef NAS_API
+ 	aud = AuOpenServer(NULL, 0, NULL, 0, NULL, NULL);
+ #endif
  #ifdef OSS_API
  	int devmask;
  
***************
*** 182,191 ****
--- 194,209 ----
  	 */
  	mixerfd = ALgetparams(AL_DEFAULT_DEVICE, pv_buf, MAX_PV_BUF);
  #endif
+ #ifdef NAS_API
+ 	if (aud == NULL) {
+ 		return FALSE;
+ 	}
+ #else
  	if (mixerfd < 0) {
  		/* probably should die more gracefully */		
  		return FALSE;
  	}
+ #endif /* NAS_API */
  
          /*
           * check driver-version
***************
*** 223,233 ****
--- 241,288 ----
   	return TRUE;	
  }
  
+ static AuDeviceID NAS_getDevice(AuServer* aud, int numTracks)
+ {
+     int i;
+ 
+     for (i = 0; i < AuServerNumDevices(aud); i++)
+     {
+        if ( (AuDeviceKind(AuServerDevice(aud, i))
+                                         == AuComponentKindPhysicalOutput) &&
+ 		(AuDeviceNumTracks(AuServerDevice(aud, i)) == numTracks ))
+         {
+ 	    return AuDeviceIdentifier(AuServerDevice(aud, i));
+         }
+     }
+ 
+     return AuNone;
+ }
+ 
  /* only works with master vol currently */
  static int
  readMixer(void)
  {
  	gint vol, r, l;
+ #ifdef NAS_API
+ 	AuDeviceID device;
+ 	AuDeviceAttributes* attr;
+ 
+ 	if (aud == NULL) return 0;
+ 
+ 	device = NAS_getDevice(aud, 2);
+ 
+ 	if (device == AuNone) return 0;
+ 
+ 	attr = AuGetDeviceAttributes( aud, device, NULL);
+ 
+ 	if (attr == AuNone) return 0;
+ 
+ 	vol = AuFixedPointRoundUp(AuDeviceGain(attr));
+ 
+ 	AuFreeDeviceAttributes(aud, 1, attr);
+ 
+ 	return vol;
+ #endif /* NAS_API */
  #ifdef OSS_API
  	/* if we couldn't open the mixer */
  	if (mixerfd < 0) return 0;
***************
*** 260,265 ****
--- 315,344 ----
  setMixer(gint vol)
  {
  	gint tvol;
+ #ifdef NAS_API
+ 	AuDeviceID device;
+ 	AuDeviceAttributes *attr;
+ 
+ 	if (aud == NULL) return;
+ 
+ 	device = NAS_getDevice(aud, 2);
+ 
+ 	attr = AuGetDeviceAttributes( aud, device, NULL);
+ 
+ 	if (attr == AuNone) return;
+ 
+ 	if (AuDeviceChangableMask(attr) & AuCompDeviceGainMask)
+ 	{
+ 		AuDeviceGain(attr) = AuFixedPointFromSum(vol, 0);
+ 
+ 		AuSetDeviceAttributes( aud, device, AuCompDeviceGainMask, attr, NULL);
+ 
+ 		AuSync(aud, AuFalse);
+ 	}
+ 
+ 	AuFreeDeviceAttributes(aud, 1, attr);
+ 
+ #endif /* NAS_API */
  #ifdef OSS_API
  	/* if we couldn't open the mixer */
  	if (mixerfd < 0) return;
***************
*** 1013,1018 ****
--- 1092,1100 ----
  	gchar *ctl = NULL;
  #endif
  
+ #ifdef NAS_API
+ 	retval = openMixer(NULL);
+ #endif
  #ifdef OSS_API
  	/* /dev/sound/mixer for devfs */
  	device = "/dev/mixer";
diff -crN ./gnome-applets/multiload/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/multiload/Makefile.am
*** ./gnome-applets/multiload/Makefile.am	Mon Mar 10 18:46:03 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/multiload/Makefile.am	Tue Jul  8 14:03:24 2003
***************
*** 5,12 ****
  	-DGNOME_DISABLE_DEPRECATED=1	\
  	-DGTK_DISABLE_DEPRECATED=1	\
  	$(GNOME_APPLETS_CFLAGS)                         \
! 	$(GTOP_APPLETS_CFLAGS)				\
! 	-Wall
  
  libexec_PROGRAMS = multiload-applet-2
  
--- 5,11 ----
  	-DGNOME_DISABLE_DEPRECATED=1	\
  	-DGTK_DISABLE_DEPRECATED=1	\
  	$(GNOME_APPLETS_CFLAGS)                         \
! 	$(GTOP_APPLETS_CFLAGS)
  
  libexec_PROGRAMS = multiload-applet-2
  
diff -crN ./gnome-applets/omf-install/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/omf-install/Makefile.am
*** ./gnome-applets/omf-install/Makefile.am	Mon Mar 10 18:46:05 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/omf-install/Makefile.am	Tue Jul  8 14:03:53 2003
***************
*** 20,26 ****
  install-data-local:
  	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
  	-for file in $(srcdir)/*.omf; do \
! 		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
  	done
  	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) 
  
--- 20,27 ----
  install-data-local:
  	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
  	-for file in $(srcdir)/*.omf; do \
! 		basefile=`basename $$file`; \
! 		$(INSTALL_DATA) $(srcdir)/$$basefile $(DESTDIR)$(omf_dest_dir); \
  	done
  	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) 
  
diff -crN ./gnome-applets/wireless/wireless-applet.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/wireless/wireless-applet.c
*** ./gnome-applets/wireless/wireless-applet.c	Mon Mar 10 18:46:16 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/wireless/wireless-applet.c	Tue Jul  8 14:06:27 2003
***************
*** 41,47 ****
  typedef enum {
  	BUSTED_LINK,
  	NO_LINK,
! 	NONE,
  } AnimationState;
  
  typedef struct {
--- 41,47 ----
  typedef enum {
  	BUSTED_LINK,
  	NO_LINK,
! 	NONE
  } AnimationState;
  
  typedef struct {
diff -crN ./gnome-applets/xmldocs.make /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/xmldocs.make
*** ./gnome-applets/xmldocs.make	Mon Mar 10 18:45:31 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/xmldocs.make	Tue Jul  8 14:06:58 2003
***************
*** 48,54 ****
  
  omf_timestamp: $(omffile)
  	-for file in $(omffile); do \
! 	  scrollkeeper-preinstall $(docdir)/`awk 'BEGIN {RS = ">" } /identifier/ {print $$0}' $${file} | awk 'BEGIN {FS="\""} /url/ {print $$2}'` $${file} $(omf_dir)/$${file}; \
  	done
  	touch omf_timestamp
  
--- 48,54 ----
  
  omf_timestamp: $(omffile)
  	-for file in $(omffile); do \
! 	  scrollkeeper-preinstall $(docdir)/`awk 'BEGIN {RS = ">" } /identifier/ {print $$0}' $(srcdir)/$${file} | awk 'BEGIN {FS="\""} /url/ {print $$2}'` $(srcdir)/$${file} $(omf_dir)/$${file}; \
  	done
  	touch omf_timestamp
  
***************
*** 65,71 ****
  
  install-data-am: omf
  	-$(mkinstalldirs) $(DESTDIR)$(docdir)/figures
! 	-cp $(srcdir)/$(xml_files) $(DESTDIR)$(docdir)
  	-for file in $(srcdir)/figures/*.png; do \
  	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
  	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/figures/$$basefile; \
--- 65,73 ----
  
  install-data-am: omf
  	-$(mkinstalldirs) $(DESTDIR)$(docdir)/figures
! 	-for file in $(xml_files); do \
! 	  cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
! 	done
  	-for file in $(srcdir)/figures/*.png; do \
  	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
  	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/figures/$$basefile; \
***************
*** 84,86 ****
--- 86,89 ----
  	done
  	-rmdir $(DESTDIR)$(docdir)/figures
  	-rmdir $(DESTDIR)$(docdir)
+