diff -crN ./gnome-applets/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/Makefile.am
*** ./gnome-applets/Makefile.am	Sat Sep  6 14:07:17 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/Makefile.am	Fri Oct 17 10:06:27 2003
***************
*** 60,66 ****
  	$(battstat_SUBDIR)	\
  	$(accessx_status_SUBDIR)
  
! DIST_SUBDIRS = \
  	po		\
  	screen-exec	\
  	mailcheck	\
--- 60,67 ----
  	$(battstat_SUBDIR)	\
  	$(accessx_status_SUBDIR)
  
! # ?? : BV : removed the 2nd ans unuseful occurence of mini-commander
! #DIST_SUBDIRS = \
  	po		\
  	screen-exec	\
  	mailcheck	\
diff -crN ./gnome-applets/charpick/charpick.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/charpick/charpick.c
*** ./gnome-applets/charpick/charpick.c	Thu Sep  4 00:51:46 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/charpick/charpick.c	Wed Nov 12 11:01:55 2003
***************
*** 3,11 ****
   */
  
  #include <config.h>
- #ifndef sun
-   #include <tgmath.h>
- #endif
  #include <panel-applet.h>
  #include <egg-screen-help.h>
  #include "charpick.h"
--- 3,8 ----
***************
*** 427,438 ****
    GtkTooltips *tooltips;
    gint size;
    gint i = 0, j, len = g_utf8_strlen (p_curr_data->charlist, -1);
!   GtkWidget *toggle_button[len];
    gchar *charlist;
    gint width, height;
    gint max_width=0, max_height=0;
    gint size_ratio;
    
    if (p_curr_data->box)
      gtk_widget_destroy(p_curr_data->box);
      
--- 424,437 ----
    GtkTooltips *tooltips;
    gint size;
    gint i = 0, j, len = g_utf8_strlen (p_curr_data->charlist, -1);
!   GtkWidget **toggle_button;
    gchar *charlist;
    gint width, height;
    gint max_width=0, max_height=0;
    gint size_ratio;
    
+   toggle_button = g_malloc (len);
+ 
    if (p_curr_data->box)
      gtk_widget_destroy(p_curr_data->box);
      
***************
*** 535,540 ****
--- 534,540 ----
    p_curr_data->last_index = NO_LAST_INDEX;
    p_curr_data->last_toggle_button = NULL;
    
+   g_free (toggle_button);
  }
  
  static void applet_change_pixel_size(PanelApplet *applet, gint size, gpointer data)
diff -crN ./gnome-applets/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/configure.in
*** ./gnome-applets/configure.in	Tue Sep  9 00:50:25 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/configure.in	Wed Nov 12 10:59:05 2003
***************
*** 182,187 ****
--- 182,193 ----
  	AM_CONDITIONAL(HAVE_LIBAPM, test "x$HAVE_LIBAPM" = "xyes")
  	AC_SUBST(HAVE_LIBAPM)
  	;;
+   *aix*)
+   	HAVE_LIBAPM=no
+   	AM_CONDITIONAL(HAVE_LIBAPM, test "x$HAVE_LIBAPM" = "xyes")
+ 	AC_SUBST(HAVE_LIBAPM)
+ 	build_battstat_applet=no
+ 	;;
    *)
  	echo "warning: ${host} is not supported by battstat_applet, not building" >&2
  	build_battstat_applet=no
***************
*** 203,211 ****
          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 ***])
--- 209,230 ----
          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 ***])
***************
*** 367,373 ****
  gkb-new/xmodmap.sun/Makefile
  gkb-new/descs.sun/Makefile
  gkb-new/gkb_xmmap.in
! gkb-new/help/Makefile
  gkb-new/help/C/Makefile
  gkb-new/help/de/Makefile
  gkb-new/help/es/Makefile
--- 386,394 ----
  gkb-new/xmodmap.sun/Makefile
  gkb-new/descs.sun/Makefile
  gkb-new/gkb_xmmap.in
! gkb-new/help/Makefile])
! 
! AC_OUTPUT([
  gkb-new/help/C/Makefile
  gkb-new/help/de/Makefile
  gkb-new/help/es/Makefile
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	Fri Sep 10 03:25:06 1999
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/geyes/themes/Makefile.am	Fri Oct 17 12:28:48 2003
***************
*** 1,36 ****
- #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)
\ No newline at end of file
--- 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	Thu Jun 26 01:38:01 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gtik/Makefile.am	Fri Oct 17 10:07:03 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/gtik.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gtik/gtik.c
*** ./gnome-applets/gtik/gtik.c	Thu Jul 24 02:48:15 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gtik/gtik.c	Mon Mar 15 13:48:01 2004
***************
*** 35,40 ****
--- 35,41 ----
  #include <sys/stat.h>
  #include <unistd.h>
  #include <dirent.h>
+ #include <locale.h>
  #include <gdk/gdkx.h>
  #include "customdrawingarea.h"
  
***************
*** 109,114 ****
--- 110,117 ----
  		
  		GtkWidget *fontDialog;
  
+ 		GtkWidget *about_dialog;
+ 
  		GtkWidget * pb;
  		
  		gtik_properties props; 
***************
*** 270,279 ****
  		gnome_vfs_async_cancel (stockdata->vfshandle);
  		stockdata->vfshandle = NULL;
  	}
! 		
! 	source_text_uri = g_strconcat("http://finance.yahoo.com/q?s=",
  				      stockdata->props.tik_syms,
! 				      "&d=v2",
  				      NULL);
  
  	source_uri = gnome_vfs_uri_new(source_text_uri);
--- 273,297 ----
  		gnome_vfs_async_cancel (stockdata->vfshandle);
  		stockdata->vfshandle = NULL;
  	}
! 
!         /*
!          * Now using a CSV file to get quotes. Specification of CSV format
!          * is in URL f=sl1c1.
!          * Availables data columns are:
!          * s: ticker symbol
!          * l: last price
!          * d: date 
!          * t: time
!          * c: change
!          * o: open price
!          * h: daily high
!          * g: daily low
!          * v: volume
!          * The digit following some data specifiers change data formating (html/raw)
!          */
! 	source_text_uri = g_strconcat("http://finance.yahoo.com/d/quotes.csv?s=",
  				      stockdata->props.tik_syms,
! 				      "&f=sl1c1&e=.csv",
  				      NULL);
  
  	source_uri = gnome_vfs_uri_new(source_text_uri);
***************
*** 407,526 ****
  
  
  	/*-----------------------------------------------------------------*/
! 	static char *extractText(const char *line) {
! 
! 		int  i=0;
! 		int  j=0;
! 		static char Text[256]="";
! 
! 		if (line == NULL) {
! 			Text[0] = '\0';
! 			return Text;
! 		}
! 
! 		while (i < (strlen(line) -1)) {
! 			if (line[i] != '>')
! 				i++;
! 			else {
! 				i++;
! 				while (line[i] != '<') {
! 					Text[j] = line[i];
! 					i++;j++;
! 				}
! 			}
! 		}
! 		Text[j] = '\0';
! 		i = 0;
! 		while (i < (strlen(Text)) ) {
! 			if (Text[i] < 32)
! 				Text[i] = '\0';
! 			i++;
! 		}
! 		return(Text);
! 				
! 	}
! 
! 	/*-----------------------------------------------------------------*/
! 	static char *parseQuote(FILE *CONFIG, char line[512]) {
  		
! 		char symbol[512];
! 		char buff[512];
! 		char price[16];
! 		char change[16];
! 		char percent[16];
! 		static char result[512]="";
! 		int  linenum=0;
! 		int AllOneLine=0;
! 		int flag=0;
! 		char *section = NULL;
! 		char *ptr;
! 
! 		if (strlen(line) > 64) AllOneLine=1;
! 
! 		if (AllOneLine) {
! 			strcpy(buff,line);
! 			while (!flag) {
! 				if ((ptr=strstr(buff,"</td>"))!=NULL) {
! 					ptr[0] = '|';
! 				}	
! 				else flag=1;
! 			}
! 			section = strtok(buff,"|");
! 		}
! 		/* Get the stock symbol */
! 		if (!AllOneLine) strcpy(symbol,extractText(line));
! 		else strcpy(symbol,extractText(section));
! 		linenum++;
! 
! 		/* Skip the time... */
! 		if (!AllOneLine) fgets(line,255,CONFIG);
! 		else section = strtok(NULL,"|");
! 		linenum++;
! 
! 		while (linenum < 8 ) {
! 			if (!AllOneLine) {
! 				fgets(line,255,CONFIG);
! 			
! 				if (strstr(line,
! 			  	 "<td align=center nowrap colspan=2>")) {
! 					strcpy(change,"");
! 					strcpy(percent,"");
! 					linenum=100;
! 				}
! 			}
! 			else {
! 				section = strtok(NULL,"|");
! 				if (strstr(section,
! 			  	 "<td align=center nowrap colspan=2>")) {
! 					strcpy(change,"");
! 					strcpy(percent,"");
! 					linenum=100;
! 				}
! 			}
! 
! 			if (linenum == 2) { 
! 				if (!AllOneLine) 
! 					strcpy(price,extractText(line));
! 				else
! 					strcpy(price,extractText(section));
! 			}
! 			else if (linenum == 3) {
! 				if (!AllOneLine)
! 					strcpy(change,extractText(line));
! 				else
! 					strcpy(change,extractText(section));
! 			}
! 			else if (linenum == 4) {
! 				if (!AllOneLine) 
! 					strcpy(percent,extractText(line));
! 				else
! 					strcpy(percent,extractText(section));
! 			}
! 			linenum++;
! 		}
! 		sprintf(result,"%s:%s:%s:%s",
! 				symbol,price,change,percent);			
! 		return(result);
  
  	}
  
--- 425,479 ----
  
  
  	/*-----------------------------------------------------------------*/
! 	static char *parseQuote(char line[1024]) {
  		
!                 char *symbol;
!                 char *price;
!                 char *change;
!                 double price_val; 
!                 double change_val; 
!                 double percent;
!                 static char result[512]="";
! 
!                 /* Yahoo file comme in C format */
!                 setlocale(LC_NUMERIC, "C");
!                 
!                 symbol = strtok(line, ",");
!                 if (symbol == NULL)
!                         return result;
! 
!                 symbol++;
!                 symbol[strlen(symbol) -1] = 0;
!                 g_message ("symbol: %s", symbol); 
!         
!                 price = strtok(NULL, ",");
!                 if (price == NULL)
!                         return result;
! 
!                 price_val = strtod(price, NULL); 
! 
!                 change = strtok(NULL, ",");
!                 if (change == NULL)
!                         return result;
! 
!                 /* file in DOS format: remove \r\n */
!                 change[strlen(change) -1] = 0;
!                 change[strlen(change) -1] = 0;
!                 change_val = strtod(change, NULL); 
!                 
!                 percent = (change_val/price_val)*1E+02; 
! 
!                 /* Restore numeric format for displaying */
!                 setlocale(LC_NUMERIC, getenv("LANG"));
!                 
!                 if (change_val == 0.0)
!                         sprintf(result,"%s:%1.2f:%1.2f:%1.2f%%",
!                                 symbol,price_val,change_val,percent);
!                 else
!                         sprintf(result,"%s:%1.2f:%1.2f:%+1.2f%%",
!                                 symbol,price_val,change_val,percent);
!         
!                 return result;
  
  	}
  
***************
*** 530,536 ****
  	int configured(StockData *stockdata) {
  		int retVar;
  
! 		char  buffer[512];
  		static FILE *CONFIG;
  
  		CONFIG = fopen((const char *)stockdata->configFileName,"r");
--- 483,489 ----
  	int configured(StockData *stockdata) {
  		int retVar;
  
! 		char  buffer[1024];
  		static FILE *CONFIG;
  
  		CONFIG = fopen((const char *)stockdata->configFileName,"r");
***************
*** 544,553 ****
  			while ( !feof(CONFIG) ) {
  				fgets(buffer, sizeof(buffer)-1, CONFIG);
  
! 				if (strstr(buffer,
! 				    "<td nowrap align=left><font face=arial size=-1><a href=\"/q\?s=")) {
  
! 				      setOutputArray(stockdata, parseQuote(CONFIG,buffer));
  				      retVar = 1;
  				}
  				else {
--- 497,505 ----
  			while ( !feof(CONFIG) ) {
  				fgets(buffer, sizeof(buffer)-1, CONFIG);
  
! 				if (!feof(CONFIG)) {
  
! 				      setOutputArray(stockdata, parseQuote(buffer));
  				      retVar = 1;
  				}
  				else {
***************
*** 756,762 ****
  	static void about_cb (BonoboUIComponent *uic,
  			      StockData         *stockdata, 
  			      const gchar       *verbname) {
- 		GtkWidget *about;
  		GdkPixbuf *pixbuf;
  		GError    *error = NULL;
  		gchar     *file;
--- 708,713 ----
***************
*** 768,779 ****
  		};
  		
  		const gchar *documenters[] = {
  			NULL
  		};
  
  		const gchar *translator_credits = _("translator_credits");
! 		
! 		
  		file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP,
  			"gnome-money.png", FALSE, NULL);
  		
--- 719,738 ----
  		};
  		
  		const gchar *documenters[] = {
+ 		        "Sun GNOME Documentation Team <gdocteam@sun.com>",
  			NULL
  		};
  
  		const gchar *translator_credits = _("translator_credits");
! 
! 		if (stockdata->about_dialog) {
! 			gtk_window_set_screen (GTK_WINDOW (stockdata->about_dialog),
! 					       gtk_widget_get_screen (stockdata->applet));
! 
! 			gtk_window_present (GTK_WINDOW (stockdata->about_dialog));
! 			return;
! 		}
! 
  		file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP,
  			"gnome-money.png", FALSE, NULL);
  		
***************
*** 787,793 ****
  			g_error_free (error);
  		}
  		
! 		about = gnome_about_new (_("Stock Ticker"), VERSION,
  		"(C) 2000 Jayson Lorenzen, Jim Garrison, Rached Blili",
  		_("This program connects to "
  		"a popular site and downloads current stock quotes.  "
--- 746,752 ----
  			g_error_free (error);
  		}
  		
! 		stockdata->about_dialog = gnome_about_new (_("Stock Ticker"), VERSION,
  		"(C) 2000 Jayson Lorenzen, Jim Garrison, Rached Blili",
  		_("This program connects to "
  		"a popular site and downloads current stock quotes.  "
***************
*** 803,811 ****
  		if (pixbuf)
  			gdk_pixbuf_unref (pixbuf);
  
! 		gtk_window_set_screen (GTK_WINDOW (about),
  				       gtk_widget_get_screen (stockdata->applet));
! 		gtk_widget_show (about);
  
  		return;
  	}
--- 762,774 ----
  		if (pixbuf)
  			gdk_pixbuf_unref (pixbuf);
  
! 		gtk_window_set_screen (GTK_WINDOW (stockdata->about_dialog),
  				       gtk_widget_get_screen (stockdata->applet));
! 
! 		g_signal_connect(G_OBJECT (stockdata->about_dialog), "destroy",
! 				 G_CALLBACK (gtk_widget_destroyed), &stockdata->about_dialog);
! 
! 		gtk_widget_show (stockdata->about_dialog);
  
  		return;
  	}
***************
*** 1355,1361 ****
  	}
  	
  	static GtkWidget *
! 	create_hig_catagory (GtkWidget *main_box, gchar *title)
  	{
  		GtkWidget *vbox, *vbox2, *hbox;
  		GtkWidget *label;
--- 1318,1324 ----
  	}
  	
  	static GtkWidget *
! 	create_hig_category (GtkWidget *main_box, gchar *title)
  	{
  		GtkWidget *vbox, *vbox2, *hbox;
  		GtkWidget *label;
***************
*** 1439,1445 ****
  		label = gtk_label_new (_("Behavior"));
  		gtk_notebook_append_page (GTK_NOTEBOOK (notebook), behav_vbox, label);
  		
! 		vbox = create_hig_catagory (behav_vbox, _("Update"));
  		
  		hbox2 = gtk_hbox_new (FALSE, 12);
  		gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);
--- 1402,1408 ----
  		label = gtk_label_new (_("Behavior"));
  		gtk_notebook_append_page (GTK_NOTEBOOK (notebook), behav_vbox, label);
  		
! 		vbox = create_hig_category (behav_vbox, _("Update"));
  		
  		hbox2 = gtk_hbox_new (FALSE, 12);
  		gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);
***************
*** 1461,1467 ****
  		if ( ! key_writable (PANEL_APPLET (stockdata->applet), "timeout"))
  			hard_set_sensitive (hbox2, FALSE);
  		
! 		vbox = create_hig_catagory (behav_vbox, _("Scrolling"));
  		
  		hbox2 = gtk_hbox_new (FALSE, 12);
  		gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);
--- 1424,1430 ----
  		if ( ! key_writable (PANEL_APPLET (stockdata->applet), "timeout"))
  			hard_set_sensitive (hbox2, FALSE);
  		
! 		vbox = create_hig_category (behav_vbox, _("Scrolling"));
  		
  		hbox2 = gtk_hbox_new (FALSE, 12);
  		gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);
***************
*** 1526,1532 ****
  		
  		size = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
  		
! 		vbox = create_hig_catagory (appear_vbox, _("Display"));
  		gtk_widget_show_all (vbox);
  		
  		hbox2 = gtk_hbox_new (FALSE, 6);
--- 1489,1495 ----
  		
  		size = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
  		
! 		vbox = create_hig_category (appear_vbox, _("Display"));
  		gtk_widget_show_all (vbox);
  		
  		hbox2 = gtk_hbox_new (FALSE, 6);
***************
*** 1567,1573 ****
  		if ( ! key_writable (PANEL_APPLET (stockdata->applet), "width"))
  			hard_set_sensitive (hbox2, FALSE);
  		
! 		vbox = create_hig_catagory (appear_vbox, _("Font and Colors"));
  		size = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
  		size2= gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
  				
--- 1530,1536 ----
  		if ( ! key_writable (PANEL_APPLET (stockdata->applet), "width"))
  			hard_set_sensitive (hbox2, FALSE);
  		
! 		vbox = create_hig_category (appear_vbox, _("Font and Colors"));
  		size = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
  		size2= gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
  				
***************
*** 1768,1773 ****
--- 1731,1738 ----
  		GtkWidget * vbox;
  		GtkWidget * frame;
  		GtkWidget *event;
+ 		GtkWidget *left_arrow;
+ 		GtkWidget *right_arrow;
  
  		gnome_vfs_init();
  		
***************
*** 1787,1794 ****
  		properties_load(stockdata);	
  
  		vbox = gtk_hbox_new (FALSE,0);
! 		stockdata->leftButton = gtk_button_new_with_label("<<");
! 		stockdata->rightButton = gtk_button_new_with_label(">>");
  		gtk_signal_connect (GTK_OBJECT (stockdata->leftButton),
  					"clicked",
  					GTK_SIGNAL_FUNC(zipLeft),stockdata);
--- 1752,1767 ----
  		properties_load(stockdata);	
  
  		vbox = gtk_hbox_new (FALSE,0);
! 		stockdata->leftButton = gtk_button_new();
! 		stockdata->rightButton = gtk_button_new();
! 		left_arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_OUT);
! 		right_arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
! 		gtk_container_add (GTK_CONTAINER (stockdata->leftButton),
! 				   left_arrow);
! 		gtk_container_add (GTK_CONTAINER (stockdata->rightButton),
! 				   right_arrow);
! 		gtk_widget_show_all (stockdata->leftButton);
! 		gtk_widget_show_all (stockdata->rightButton);				
  		gtk_signal_connect (GTK_OBJECT (stockdata->leftButton),
  					"clicked",
  					GTK_SIGNAL_FUNC(zipLeft),stockdata);
***************
*** 1814,1819 ****
--- 1787,1793 ----
  		gtk_tooltips_set_tip(stockdata->tooltips, event, _("Stock Ticker\nGet continuously updated stock quotes"), NULL);
  
  		access_drawing_area = stockdata->drawing_area = GTK_WIDGET (custom_drawing_area_new());
+ 		g_object_add_weak_pointer (G_OBJECT (access_drawing_area), (gpointer *)&access_drawing_area);
  		gtk_drawing_area_size(GTK_DRAWING_AREA (stockdata->drawing_area),
  						stockdata->props.width,-1);
  
***************
*** 1867,1872 ****
--- 1841,1859 ----
  				                   gtik_applet_menu_verbs,
  				                   stockdata);
  
+ /* No panel_applet_get_locked_down()
+ 		if (panel_applet_get_locked_down (PANEL_APPLET (applet))) {
+ 			BonoboUIComponent *popup_component;
+ 
+ 			popup_component = panel_applet_get_popup_component (PANEL_APPLET (applet));
+ 
+ 			bonobo_ui_component_set_prop (popup_component,
+ 						      "/commands/Props",
+ 						      "hidden", "1",
+ 						      NULL);
+ 		}
+  */
+ 
  		/* KEEPING TIMER ID FOR CLEANUP IN DESTROY */
  		stockdata->drawTimeID = gtk_timeout_add(stockdata->props.scroll_speed,
  						        Repaint,stockdata);
***************
*** 1928,1933 ****
--- 1915,1923 ----
  			g_free (stockdata->configFileName);
  		if (stockdata->my_font)
  			pango_font_description_free (stockdata->my_font);
+ 
+ 		if (stockdata->about_dialog)
+ 			 gtk_widget_destroy (stockdata->about_dialog); 
  		
  		if (stockdata->pb)
  			gtk_widget_destroy (stockdata->pb);
***************
*** 1972,1981 ****
  
  	/*-----------------------------------------------------------------*/
  	char *splitChange(StockData *stockdata,char *data, StockQuote *quote) {
! 		char buff[128]="";
! 		static char buff2[128]="";
  		char *var1, *var2, *var3, *var4;
  
  		strcpy(buff,data);
  		var1 = strtok(buff,":");
  		var2 = strtok(NULL,":");
--- 1962,1976 ----
  
  	/*-----------------------------------------------------------------*/
  	char *splitChange(StockData *stockdata,char *data, StockQuote *quote) {
! 		char buff[128]; 
! 		static char buff2[128];
  		char *var1, *var2, *var3, *var4;
+ 		char rise[2]; 
  
+                 bzero(buff, 128); 
+                 bzero(buff2, 128); 
+                 bzero(rise, 2); 
+                 
  		strcpy(buff,data);
  		var1 = strtok(buff,":");
  		var2 = strtok(NULL,":");
***************
*** 1985,1999 ****
  		if (!var3 || !var4)
  			return NULL;
  
! 		if (var3[0] == '+') { 
  #if 0
  			if (stockdata->symbolfont)
  				var3[0] = 221;
  #endif
  			var4[0] = '(';
  			quote->color = GREEN;
  		}
! 		else if (var3[0] == '-') {
  #if 0
  			if (stockdata->symbolfont)
  				var3[0] = 223;	
--- 1980,1995 ----
  		if (!var3 || !var4)
  			return NULL;
  
! 		if (var4[0] == '+') { 
  #if 0
  			if (stockdata->symbolfont)
  				var3[0] = 221;
  #endif
  			var4[0] = '(';
  			quote->color = GREEN;
+ 			sprintf (rise, "+");
  		}
! 		else if (var4[0] == '-') {
  #if 0
  			if (stockdata->symbolfont)
  				var3[0] = 223;	
***************
*** 2007,2013 ****
  			quote->color = WHITE;
  		}
  
! 		sprintf(buff2,"%s %s)",var3,var4);
  		return(buff2);
  	}
  
--- 2003,2009 ----
  			quote->color = WHITE;
  		}
  
! 		sprintf(buff2,"%s%s %s)",rise, var3,var4);
  		return(buff2);
  	}
  
***************
*** 2018,2024 ****
  		char *change;
  		PangoRectangle rect;
  
! 		price = splitPrice(param1);
  		change = splitChange(stockdata, param1, &quote);
  
  		quote.price = g_strdup(price);
--- 2014,2020 ----
  		char *change;
  		PangoRectangle rect;
  
! 		price = splitPrice(param1);		
  		change = splitChange(stockdata, param1, &quote);
  
  		quote.price = g_strdup(price);
***************
*** 2038,2044 ****
  			quote.changelen = 0;
  			quote.changeheight = 0;
  		}
! 		
  
  #if 0
  		g_message("Param1: %s\nPrice: %s\nChange: %s\nColor: %d\n\n", param1, price, change, quote.color);
--- 2034,2040 ----
  			quote.changelen = 0;
  			quote.changeheight = 0;
  		}
! 		 
  
  #if 0
  		g_message("Param1: %s\nPrice: %s\nChange: %s\nColor: %d\n\n", param1, price, change, quote.color);
***************
*** 2204,2210 ****
  	}
  
  	static AtkObject* gtik_vbox_accessible_ref_child(AtkObject *obj, gint i){
! 		return (gtk_widget_get_accessible(access_drawing_area));
  	}
  
  	gchar* gtik_get_text(void) {
--- 2200,2210 ----
  	}
  
  	static AtkObject* gtik_vbox_accessible_ref_child(AtkObject *obj, gint i){
! 		if (i == 0 && access_drawing_area)
! 			return g_object_ref (gtk_widget_get_accessible(access_drawing_area));
! 		else
! 			return NULL;
! 		
  	}
  
  	gchar* gtik_get_text(void) {
diff -crN ./gnome-applets/gweather/docs/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gweather/docs/Makefile.am
*** ./gnome-applets/gweather/docs/Makefile.am	Fri Mar 28 02:14:17 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gweather/docs/Makefile.am	Tue Jan  6 20:07:30 2004
***************
*** 1,4 ****
  ## Process this file with automake to produce Makefile.in
  
! SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
  
--- 1,6 ----
  ## Process this file with automake to produce Makefile.in
  
! #SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
! # ?? BV : To put back it locale once documentation corrected
! SUBDIRS = C de es fr sv ja ko zh_CN zh_TW
  
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	Thu Jul 24 02:48:17 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/gweather/gweather-pref.c	Fri Oct 17 10:07:44 2003
***************
*** 1,4 ****
! /* $Id: gweather-pref.c,v 1.69 2003/07/22 00:00:33 dcransto Exp $ */
  
  /*
   *  Papadimitriou Spiros <spapadim+@cs.cmu.edu>
--- 1,5 ----
! 
! /* $Id: gweather-pref.c,v 1.1.3.6 2003/10/17 09:07:42 bergerv Exp $ */
  
  /*
   *  Papadimitriou Spiros <spapadim+@cs.cmu.edu>
***************
*** 38,44 ****
  {
      COL_LOC = 0,
      COL_POINTER,
!     NUM_COLUMNS,
  }; 
  
  
--- 39,45 ----
  {
      COL_LOC = 0,
      COL_POINTER,
!     NUM_COLUMNS
  }; 
  
  
diff -crN ./gnome-applets/mailcheck/popcheck.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/mailcheck/popcheck.c
*** ./gnome-applets/mailcheck/popcheck.c	Thu May 29 03:12:30 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/mailcheck/popcheck.c	Wed Nov 12 11:06:25 2003
***************
*** 128,136 ****
--- 128,139 ----
    struct sockaddr_in peer;
    int fd, p;
    char *hn;
+ 
+ #ifndef h_errno
    extern int h_errno;
  
    h_errno = 0;
+ #endif
    
    hn = get_server_hostname(h);
    if (!hn)
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	Thu Jul 24 02:48:21 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/mixer/mixer.c	Fri Oct 17 10:07:54 2003
***************
*** 75,80 ****
--- 75,83 ----
  #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 */
***************
*** 88,93 ****
--- 91,99 ----
  #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"
***************
*** 169,174 ****
--- 175,183 ----
  			  MixerData                    *data);
  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;
  
***************
*** 248,253 ****
--- 257,265 ----
  openMixer(const gchar *device_name, MixerData *data) 
  {
  	gint res, ver;
+ #ifdef NAS_API
+ 	aud = AuOpenServer(NULL, 0, NULL, 0, NULL, NULL);
+ #endif
  #ifdef OSS_API
  	
  
***************
*** 264,273 ****
--- 276,291 ----
  	 */
  	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
***************
*** 290,300 ****
--- 308,355 ----
   	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(MixerData *data)
  {
  	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;
***************
*** 327,332 ****
--- 382,411 ----
  setMixer(gint vol, MixerData *data)
  {
  	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;
***************
*** 1533,1538 ****
--- 1612,1620 ----
  	panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
  	get_channel (data);
  
+ #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	Thu Jun 26 01:44:44 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/multiload/Makefile.am	Fri Oct 17 10:08:02 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	Thu Jan  1 01:00:00 1970
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/omf-install/Makefile.am	Tue Jul  8 13:03:53 2003
***************
*** 0 ****
--- 1,34 ----
+ # 
+ # Modify the definition of $omf_dest_dir, replacing "gdp-example1" with
+ # the name of your package.
+ # 
+ # No other modifications should be necessary.
+ #
+ # Note that you must configure your package with --localstatedir=/var/lib
+ # so that the scrollkeeper-update command below will update the database
+ # in the standard scrollkeeper directory.
+ #
+ # If it is impossible to configure with --localstatedir=/var/lib, then
+ # modify the definition of scrollkeeper_localstate_dir so that
+ # it points to the correct location. Note that you must still use 
+ # $(localstatedir) in this or when people build RPMs it will update
+ # the real database on their system instead of the one under RPM_BUILD_ROOT.
+ 
+ omf_dest_dir=$(datadir)/omf/gnome-applets
+ scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
+ 
+ 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) 
+ 
+ uninstall-local:
+ 	-for file in $(srcdir)/*.omf; do \
+ 		basefile=`basename $$file`; \
+ 		rm -f $(omf_dest_dir)/$$basefile; \
+         done
+ 	-rmdir $(omf_dest_dir)
+ 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) 
diff -crN ./gnome-applets/panel-menu/GNOME_PanelMenuApplet.server.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/panel-menu/GNOME_PanelMenuApplet.server.in
*** ./gnome-applets/panel-menu/GNOME_PanelMenuApplet.server.in	Thu Jan  1 01:00:00 1970
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/panel-menu/GNOME_PanelMenuApplet.server.in	Tue Jul  8 13:05:21 2003
***************
*** 0 ****
--- 1,25 ----
+ <oaf_info>
+ 	<oaf_server iid="OAFIID:GNOME_PanelMenuApplet_Factory" type="shlib" location="libpanel-menu.so">
+ 		<oaf_attribute name="repo_ids" type="stringv">
+ 			<item value="IDL:Bonobo/GenericFactory:1.0"/>
+ 			<item value="IDL:Bonobo/Unknown:1.0"/>
+ 		</oaf_attribute>
+ 		<oaf_attribute name="name" type="string" _value="Panel Menu Applet Factory"/>
+ 		<oaf_attribute name="description" type="string" _value="Factory for Panel Menu Applet"/>
+ 	</oaf_server>
+ 
+ 	<oaf_server iid="OAFIID:GNOME_PanelMenuApplet" type="factory" location="OAFIID:GNOME_PanelMenuApplet_Factory">
+ 		<oaf_attribute name="repo_ids" type="stringv">
+ 			<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+ 			<item value="IDL:Bonobo/Control:1.0"/>
+ 			<item value="IDL:Bonobo/Unknown:1.0"/>
+ 		</oaf_attribute>
+ 		<oaf_attribute name="name" type="string" value="Menu Bar"/>
+ 		<oaf_attribute name="description" type="string" _value="Panel applet for displaying menus"/>
+ 		<oaf_attribute name="panel:category" type="string" _value="Utility"/>
+ 		<oaf_attribute name="panel:icon" type="string" value="gnome-logo-icon-transparent.png"/>
+ 		<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+ 	        <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
+         	<oaf_attribute name="bugzilla:component" type="string" value="menu applet"/>
+ 	</oaf_server>
+ </oaf_info>
diff -crN ./gnome-applets/sgmldocs.make /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/sgmldocs.make
*** ./gnome-applets/sgmldocs.make	Thu Jan  1 01:00:00 1970
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/sgmldocs.make	Tue Jul  8 13:05:57 2003
***************
*** 0 ****
--- 1,138 ----
+ # To use this template:
+ #     1) Define: figs, docname, lang, omffile, sgml_ents although figs, 
+ #        omffile, and sgml_ents may be empty in your Makefile.am which 
+ #        will "include" this one 
+ #     2) Figures must go under figures/ and be in PNG format
+ #     3) You should only have one document per directory 
+ #
+ #        Note that this makefile forces the directory name under
+ #        $prefix/share/gnome/help/ to be the same as the SGML filename
+ #        of the document.  This is required by GNOME. eg:
+ #        $prefix/share/gnome/help/fish_applet/C/fish_applet.sgml
+ #                                 ^^^^^^^^^^^   ^^^^^^^^^^^
+ # Definitions:
+ #   figs         A list of screenshots which will be included in EXTRA_DIST
+ #                Note that these should reside in figures/ and should be .png
+ #                files, or you will have to make modifications below.
+ #   docname      This is the name of the SGML file: <docname>.sgml
+ #   lang         This is the document locale
+ #   omffile      This is the name of the OMF file.  Convention is to name
+ #                it <docname>-<locale>.omf.
+ #   sgml_ents    This is a list of SGML entities which must be installed 
+ #                with the main SGML file and included in EXTRA_DIST. 
+ # eg:
+ #   figs = \
+ #          figures/fig1.png            \
+ #          figures/fig2.png
+ #   docname = scrollkeeper-manual
+ #   lang = C
+ #   omffile=scrollkeeper-manual-C.omf
+ #   sgml_ents = fdl.sgml
+ #   include $(top_srcdir)/help/sgmldocs.make
+ #   dist-hook: app-dist-hook
+ #
+ 
+ docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+ 
+ doc_DATA = index.html
+ 
+ sgml_files = $(sgml_ents) $(docname).sgml
+ 
+ omf_dir=$(top_srcdir)/omf-install
+ 
+ EXTRA_DIST = $(sgml_files) $(doc_DATA) $(omffile) $(figs)
+ 
+ CLEANFILES = omf_timestamp
+ 
+ all: index.html omf
+ 
+ omf: omf_timestamp
+ 
+ omf_timestamp: $(omffile)
+ 	-for file in $(omffile); do \
+ 	  scrollkeeper-preinstall $(docdir)/$(docname).sgml $$file $(omf_dir)/$$file; \
+ 	done
+ 	touch omf_timestamp
+ 
+ index.html: $(docname)/index.html
+ 	-cp $(docname)/index.html .
+ 
+ $(docname).sgml: $(sgml_ents)
+         -ourdir=`pwd`;  \
+         cd $(srcdir);   \
+         cp $(sgml_ents) $$ourdir
+ 
+ 
+ # The weird srcdir trick is because the db2html from the Cygnus RPMs
+ # cannot handle relative filenames
+ $(docname)/index.html: $(srcdir)/$(docname).sgml
+ 	-srcdir=`cd $(srcdir) && pwd`;			\
+ 	if test "$(HAVE_JW)" = 'yes' ; then 		\
+ 		jw -c /etc/sgml/catalog $$srcdir/$(docname).sgml -o $$srcdir/$(docname); \
+ 	else 						\
+ 		db2html $$srcdir/$(docname).sgml; 	\
+ 	 fi
+ 
+ app-dist-hook: index.html
+ 	-$(mkinstalldirs) $(distdir)/$(docname)/stylesheet-images
+ 	-$(mkinstalldirs) $(distdir)/figures
+ 	-cp $(srcdir)/$(docname)/*.html $(distdir)/$(docname)
+ 	-for file in $(srcdir)/$(docname)/*.css; do \
+ 	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+ 	  cp $$file $(distdir)/$(docname)/$$basefile ; \
+ 	done
+ 	-for file in $(srcdir)/$(docname)/stylesheet-images/*.gif; do \
+ 	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+ 	  cp $$file $(distdir)/$(docname)/stylesheet-images/$$basefile ; \
+ 	done
+ 	-if [ -e topic.dat ]; then \
+ 		cp $(srcdir)/topic.dat $(distdir); \
+ 	 fi
+ 
+ install-data-am: index.html omf
+ 	-$(mkinstalldirs) $(DESTDIR)$(docdir)/stylesheet-images
+ 	-$(mkinstalldirs) $(DESTDIR)$(docdir)/figures
+ 	-cp $(srcdir)/$(sgml_files) $(DESTDIR)$(docdir)
+ 	-for file in $(srcdir)/$(docname)/*.html $(srcdir)/$(docname)/*.css; do \
+ 	  basefile=`echo $$file | sed -e 's,^.*/,,'`; \
+ 	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$$basefile; \
+ 	done
+ 	-for file in $(srcdir)/figures/*.png; do \
+ 	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+ 	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/figures/$$basefile; \
+ 	done
+ 	-for file in $(srcdir)/$(docname)/stylesheet-images/*.gif; do \
+ 	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+ 	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/stylesheet-images/$$basefile; \
+ 	done
+ 	-if [ -e $(srcdir)/topic.dat ]; then \
+ 		$(INSTALL_DATA) $(srcdir)/topic.dat $(DESTDIR)$(docdir); \
+ 	 fi
+ 
+ $(docname).ps: $(srcdir)/$(docname).sgml
+ 	-srcdir=`cd $(srcdir) && pwd`; \
+ 	db2ps $$srcdir/$(docname).sgml
+ 
+ $(docname).rtf: $(srcdir)/$(docname).sgml
+ 	-srcdir=`cd $(srcdir) && pwd`; \
+ 	db2ps $$srcdir/$(docname).sgml
+ 
+ uninstall-local:
+ 	-for file in $(srcdir)/$(docname)/stylesheet-images/*.gif; do \
+ 	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+ 	  rm -f $(docdir)/stylesheet-images/$$basefile; \
+ 	done
+ 	-for file in $(srcdir)/figures/*.png; do \
+ 	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+ 	  rm -f $(docdir)/figures/$$basefile; \
+ 	done
+ 	-for file in $(srcdir)/$(docname)/*.html $(srcdir)/$(docname)/*.css; do \
+ 	  basefile=`echo $$file | sed -e 's,^.*/,,'`; \
+ 	  rm -f $(DESTDIR)$(docdir)/$$basefile; \
+ 	done
+ 	-for file in $(sgml_files); do \
+ 	  rm -f $(DESTDIR)$(docdir)/$$file; \
+ 	done
+ 	-rmdir $(DESTDIR)$(docdir)/stylesheet-images
+ 	-rmdir $(DESTDIR)$(docdir)/figures
+ 	-rmdir $(DESTDIR)$(docdir)
diff -crN ./gnome-applets/stickynotes/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/stickynotes/Makefile.am
*** ./gnome-applets/stickynotes/Makefile.am	Sat Sep  6 14:08:52 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/stickynotes/Makefile.am	Wed Nov 12 11:08:45 2003
***************
*** 2,8 ****
  
  SUBDIRS = pixmaps docs
  
! CFLAGS = -Wall -g
  
  INCLUDES = \
  	-I. \
--- 2,8 ----
  
  SUBDIRS = pixmaps docs
  
! CFLAGS = $(WARN_CFLAGS) -g
  
  INCLUDES = \
  	-I. \
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	Sat Aug 23 14:10:54 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/wireless/wireless-applet.c	Wed Nov 12 11:10:06 2003
***************
*** 45,51 ****
  	PIX_SIGNAL_2,
  	PIX_SIGNAL_3,
  	PIX_SIGNAL_4,
! 	PIX_NUMBER,
  } PixmapState;
  
  static char * pixmap_names[] = {
--- 45,51 ----
  	PIX_SIGNAL_2,
  	PIX_SIGNAL_3,
  	PIX_SIGNAL_4,
! 	PIX_NUMBER
  } PixmapState;
  
  static char * pixmap_names[] = {
diff -crN ./gnome-applets/xmldocs.make /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/xmldocs.make
*** ./gnome-applets/xmldocs.make	Tue Sep  9 00:59:39 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-applets/xmldocs.make	Fri Oct 17 10:08:20 2003
***************
*** 1,3 ****
--- 1,4 ----
+ 
  #
  # No modifications of this Makefile should be necessary.
  #
