--- ./plugger.7	Fri Dec  7 07:37:12 2001
+++ ../plugger-4.0/./plugger.7	Thu Sep 26 22:39:33 2002
@@ -22,17 +22,21 @@
 
 	$HOME/.netscape/
 .br
+	$HOME/.mozilla/
+.br
 	$HOME/.opera/
 .br
 	$MOZILLA_HOME/
 .br
-	$OPERA_HOME/
+	$OPERA_DIR/
+.br
+	/usr/freeware/etc/pluggerrc
 .br
 	/usr/local/netscape/pluggerrc
 .br
 	/etc/pluggerrc
 .br
-	/usr//etc/pluggerrc
+	/usr/etc/pluggerrc
 .br
 	/usr/local/etc/pluggerrc
 
--- ./plugger.h	Fri Dec  7 07:14:21 2001
+++ ../plugger-4.0/./plugger.h	Thu Sep 26 21:56:19 2002
@@ -43,7 +43,7 @@
   fprintf(debug_output,"------------\n");
   return   debug_output;
 }
-static int D(char *fmt, ...)
+static void D(char *fmt, ...)
 {
   FILE *f;
   char buffer[9999];
@@ -61,7 +61,7 @@
 }
 #else
 /* OPTIMIZE ME! */
-static int D(char *fmt, ...) { }
+static void D(char *fmt, ...) { }
 #endif
 
 
--- ./plugger.c	Wed Dec  5 16:49:45 2001
+++ ../plugger-4.0/./plugger.c	Thu Sep 26 21:56:18 2002
@@ -51,7 +51,7 @@
 
 /* UGLY */
 #include "plugger-common.c"
-#define WINDOW ((Window) THIS->windata.window)
+#define WINDOW ((Window) (THIS->windata.window))
 
 struct data
 {
@@ -457,6 +457,12 @@
     if(cb(fname, data)) return 1;
   }
 
+#ifdef __sgi
+  sprintf(fname,"/usr/freeware/bin/%s",basename);
+  if(cb(fname, data)) return 1;
+  sprintf(fname,"/usr/freeware/etc/%s",basename);
+  if(cb(fname, data)) return 1;
+#endif /* __sgi */
   sprintf(fname,"/usr/local/netscape/%s",basename);
   if(cb(fname, data)) return 1;
   sprintf(fname,"/etc/%s",basename);
@@ -466,7 +472,7 @@
   sprintf(fname,"/usr/local/etc/%s",basename);
   if(cb(fname, data)) return 1;
   if(cb(basename, data)) return 1;
-  
+
   return 0;
 }
 
@@ -685,7 +691,7 @@
   THIS->repeats=0x7fffffff;
   THIS->pid1=-1;
   THIS->pid2=-1;
-  WINDOW=0;
+  THIS->windata.window=0;
   THIS->displayname=0;
   THIS->display=0;
   
@@ -832,12 +838,12 @@
     {
       if(!inpath("xmessage"))
       {
-	NPN_Status(instance, "No approperiate application found!");
+	NPN_Status(instance, "No appropriate application found!");
 	return NPERR_GENERIC_ERROR;
       }else{
 	D("Using xmessage!!!\n");
 	/* Hard-coded default */
-	THIS->command="xmessage -buttons '' \"Plugger: No approperiate application for type $mimetype found!\"";
+	THIS->command="xmessage -buttons '' \"Plugger: No appropriate application found for type $mimetype!\"";
 	THIS->flags = H_REPEATCOUNT | H_FILL | H_SWALLOW | H_IGNORE_ERRORS;
 	THIS->winname="Xmessage";
       }
@@ -869,7 +875,7 @@
     if(THIS->pid1==-1)
     {
       NPN_Status(instance, "Streamer: My_Fork failed!");
-      return;
+      return NPERR_GENERIC_ERROR;
     }
     
     if(!THIS->pid1)
@@ -1359,5 +1365,3 @@
     }
   }
 }
-
-
--- ./pluggerrc	Wed Dec  5 14:14:01 2001
+++ ../plugger-4.0/./pluggerrc	Fri Sep 27 00:37:46 2002
@@ -83,6 +83,7 @@
 
 audio/wav:wav:Microsoft wave file
 audio/x-wav:wav:Microsoft wave file
+	: sfplay -nice -match -quiet "$file"
 	stream preload: splay -W
 	repeat swallow(alsaplayer): alsaplayer -q "$file" >/dev/null
 	: wavplay -q "$file"
@@ -144,6 +145,7 @@
 text/x-pdf: pdf: PDF file
 	repeat swallow(documentShell) fill: acroread -geometry +9000+9000 -xrm '*userFrontEndProgram: FALSE' "$file"
 	repeat swallow(gv) fill: gv -safer -quiet -antialias -geometry +9000+9000 "$file" 2>/dev/null
+	repeat swallow(ghostview) fill: ghostview -safer -quiet -antialias -geometry +9000+9000 "$file" 2>/dev/null
 	repeat swallow(xpdf) fill: xpdf -g +9000+9000 -err "$file"
 
 
@@ -153,6 +155,7 @@
 application/x-postscript: ps: PostScript file
 application/postscript: ps: PostScript file
 	repeat swallow(gv) fill: gv -safer -quiet -antialias -geometry +9000+9000 "$file" 2>/dev/null
+	repeat swallow(ghostview) fill: ghostview -safer -quiet -antialias -geometry +9000+9000 "$file" 2>/dev/null
 	repeat swallow(Pageview) fill: pageview "$file"
 
 
--- ./Makefile	Fri Dec  7 10:59:20 2001
+++ ../plugger-4.0/./Makefile	Thu Sep 26 22:09:19 2002
@@ -91,7 +91,7 @@
 BIN_FILES=plugger.so plugger-$(VERSION)
 
 DEFINES=$(STREAM) -DVERSION=\"$(VERSION)\" # -DDEBUG # -DPLUGIN_TRACE
-COMMON_CFLAGS=-O -I$(SDK)/include -I$(X11)/include -DXP_UNIX $(DEFINES)
+COMMON_CFLAGS=-I$(SDK)/include -DXP_UNIX $(DEFINES)
 COMMON_LDFLAGS=
 NORM_CFLAGS=
 NORM_LDFLAGS=
@@ -117,14 +117,14 @@
 plugger.o: plugger.c plugger.h
 	$(CC) -c $(SHARED_CFLAGS) -o plugger.o plugger.c
 
-common.o: $(SDK)/common/npunix.c
-	$(CC) -c $(SHARED_CFLAGS) -o common.o $(SDK)/common/npunix.c
+common.o: npunix.c # $(SDK)/common/npunix.c
+	$(CC) -c $(SHARED_CFLAGS) -o common.o npunix.c # $(SDK)/common/npunix.c
 
 clean:
-	-rm *.o
+	-rm -f *.o
 
 spotless: clean
-	-rm *.so *~ core plugger-$(VERSION)
+	-rm -f *.so *~ core plugger-$(VERSION)
 	-rm -rf rpmtmp
 
 localinstall:
--- ./plugger-common.c	Mon Nov 26 05:17:36 2001
+++ ../plugger-4.0/./plugger-common.c	Thu Sep 26 21:56:18 2002
@@ -11,7 +11,7 @@
   select(0,0,0,0,&timeout);
 }
 
-static int my_kill(int pid)
+static void my_kill(int pid)
 {
   if(!kill(pid, SIGTERM))
   {
--- ./plugger-helper.c	Mon Dec 10 01:41:11 2001
+++ ../plugger-4.0/./plugger-helper.c	Thu Sep 26 21:56:18 2002
@@ -397,7 +397,7 @@
 
 static void sigwinch(int tmp)
 {
-//  D("---SIGWINCH---\n");
+  /* D("---SIGWINCH---\n"); */
   got_sigwinch=1;
 }
 
@@ -460,8 +460,8 @@
     int loops=1;
 
     /* If command expects data on stdin but data is actually in
-     * a file, open the file and connect it to stdin.
-     /*
+     * a file, open the file and connect it to stdin. */
+/*
     if(file && (flags & H_STREAM))
     {
       int fd=open(file,O_RDONLY);
@@ -469,7 +469,7 @@
       close(fd);
       D("Stream from file %s\n",file);
     }
-
+*/
     /* Hmm, what does H_REPEATCOUNT do again?? */
     if(flags & H_REPEATCOUNT)
     {