--- ./wv/Makefile.in	Fri Jun  7 13:48:09 2002
+++ ../abiword-1.0.3/./wv/Makefile.in	Sat Nov 30 17:27:47 2002
@@ -293,6 +293,10 @@
 	wvVersion$(EXEEXT)
 endif
 
+# We cannot built libwv.a until after the subdirs are made,
+# otherwise we'll end up with an empty ms-ole.o or something.
+.NOTPARALLEL:
+
 all: WVSUBDIRS libwv.a $(WVEXECS)
 
 wvRTF$(EXEEXT): wvRTF.$(OBJEXT) $(GETOPT) OLEDECODE BLIBOLE2 libwv.a
--- ./wv/stylesheet.c	Tue Apr 10 20:27:48 2001
+++ ../abiword-1.0.3/./wv/stylesheet.c	Sat Nov 30 17:27:47 2002
@@ -186,7 +186,7 @@
 
 
     wvTrace (("doing a std, str len is %d\n", len + 1));
-    item->xstzName = (U16 *) wvMalloc ((len + 1) * sizeof (XCHAR));
+    item->xstzName = (char*) (U16 *) wvMalloc ((len + 1) * sizeof (XCHAR));
 
     for (i = 0; i < len + 1; i++)
       {
--- ./abi/src/af/ev/unix/gnome/ev_UnixGnomeMenuPopup.h	Tue Feb  6 17:53:53 2001
+++ ../abiword-1.0.3/./abi/src/af/ev/unix/gnome/ev_UnixGnomeMenuPopup.h	Sat Nov 30 17:27:47 2002
@@ -20,7 +20,7 @@
 #ifndef EV_UNIXGNOMEMENUPOPUP_H
 #define EV_UNIXGNOMEMENUPOPUP_H
 
-#include "ev_UnixGnomeMenu.h"
+#include "gnome/ev_UnixGnomeMenu.h"
 #include "ev_UnixMenuPopup.h"
 
 class AV_View;
--- ./abi/src/af/ev/unix/gnome/ev_UnixGnomeToolbar.cpp	Wed Mar  6 06:46:21 2002
+++ ../abiword-1.0.3/./abi/src/af/ev/unix/gnome/ev_UnixGnomeToolbar.cpp	Thu Dec  5 15:31:03 2002
@@ -26,8 +26,8 @@
 #include "ut_string.h"
 #include "ev_UnixToolbar.h"
 #include "xap_Types.h"
-#include "xap_UnixGnomeApp.h"
-#include "xap_UnixGnomeFrame.h"
+#include "gnome/xap_UnixGnomeApp.h"
+#include "gnome/xap_UnixGnomeFrame.h"
 #include "ev_Toolbar_Actions.h"
 #include "ev_Toolbar_Layouts.h"
 #include "ev_Toolbar_Labels.h"
@@ -37,7 +37,7 @@
 #include "ev_UnixToolbar_ViewListener.h"
 #include "xav_View.h"
 #include "xap_Prefs.h"
-#include "ev_UnixGnomeToolbar.h"
+#include "gnome/ev_UnixGnomeToolbar.h"
 #include "ap_Toolbar_Id.h"
 #include "ap_UnixToolbar_StyleCombo.h"
 
@@ -132,10 +132,10 @@
 		pFrame->dragEnd(wd->m_id);
 	};
 
+	bool				m_blockSignal;
 	EV_UnixGnomeToolbar *	m_pUnixToolbar;
 	XAP_Toolbar_Id		m_id;
 	GtkWidget *			m_widget;
-	bool				m_blockSignal;
 
 	char 				m_comboEntryBuffer[1024];
 };
--- ./abi/src/af/ev/unix/gnome/ev_UnixGnomeMenu.cpp	Fri Feb  8 11:29:18 2002
+++ ../abiword-1.0.3/./abi/src/af/ev/unix/gnome/ev_UnixGnomeMenu.cpp	Sat Nov 30 17:27:47 2002
@@ -30,10 +30,10 @@
 #include "ut_string.h"
 #include "ut_debugmsg.h"
 #include "xap_Types.h"
-#include "ev_UnixGnomeMenuBar.h"
-#include "ev_UnixGnomeMenuPopup.h"
-#include "xap_UnixGnomeApp.h"
-#include "xap_UnixGnomeFrame.h"
+#include "gnome/ev_UnixGnomeMenuBar.h"
+#include "gnome/ev_UnixGnomeMenuPopup.h"
+#include "gnome/xap_UnixGnomeApp.h"
+#include "gnome/xap_UnixGnomeFrame.h"
 #include "ev_UnixKeyboard.h"
 #include "ev_Menu_Layouts.h"
 #include "ev_Menu_Actions.h"
--- ./abi/src/af/ev/unix/gnome/ev_UnixGnomeToolbar.h	Wed Nov 14 02:11:15 2001
+++ ../abiword-1.0.3/./abi/src/af/ev/unix/gnome/ev_UnixGnomeToolbar.h	Sat Nov 30 17:27:47 2002
@@ -26,8 +26,8 @@
 #include "xap_Types.h"
 #include "ev_UnixToolbar.h"
 #include "xav_Listener.h"
-#include "xap_UnixGnomeApp.h"
-#include "xap_UnixGnomeFrame.h"
+#include "gnome/xap_UnixGnomeApp.h"
+#include "gnome/xap_UnixGnomeFrame.h"
 
 class AP_UnixToolbar_Icons;
 class EV_UnixToolbar_ViewListener;
--- ./abi/src/af/ev/unix/ev_UnixToolbar.cpp	Tue Sep  3 13:48:06 2002
+++ ../abiword-1.0.3/./abi/src/af/ev/unix/ev_UnixToolbar.cpp	Thu Dec  5 15:31:10 2002
@@ -248,10 +248,10 @@
 
 
 
+	bool				m_blockSignal;
 	EV_UnixToolbar *	m_pUnixToolbar;
 	XAP_Toolbar_Id		m_id;
 	GtkWidget *			m_widget;
-	bool				m_blockSignal;
 	char 				m_comboEntryBuffer[1024];
 };
 /*****************************************************************/
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_FontChooser.cpp	Mon Dec  3 19:28:36 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_FontChooser.cpp	Sat Nov 30 17:27:47 2002
@@ -28,7 +28,7 @@
 #include "ut_misc.h"
 #include "ut_units.h"
 #include "xap_UnixDialogHelper.h"
-#include "xap_UnixGnomeDlg_FontChooser.h"
+#include "gnome/xap_UnixGnomeDlg_FontChooser.h"
 #include "xap_UnixApp.h"
 #include "xap_UnixFrame.h"
 
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeFrame.cpp	Sat Jul 20 03:25:03 2002
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeFrame.cpp	Sat Nov 30 17:27:47 2002
@@ -26,13 +26,13 @@
 #include "xap_ViewListener.h"
 #include "xap_UnixApp.h"
 #include "xap_UnixFrame.h"
-#include "xap_UnixGnomeApp.h"
-#include "xap_UnixGnomeFrame.h"
+#include "gnome/xap_UnixGnomeApp.h"
+#include "gnome/xap_UnixGnomeFrame.h"
 #include "ev_UnixKeyboard.h"
 #include "ev_UnixMouse.h"
-#include "ev_UnixGnomeMenuBar.h"
-#include "ev_UnixGnomeMenuPopup.h"
-#include "ev_UnixGnomeToolbar.h"
+#include "gnome/ev_UnixGnomeMenuBar.h"
+#include "gnome/ev_UnixGnomeMenuPopup.h"
+#include "gnome/ev_UnixGnomeToolbar.h"
 #include "ev_EditMethod.h"
 #include "xav_View.h"
 #include "xad_Document.h"
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Zoom.cpp	Fri Jan 25 15:18:39 2002
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Zoom.cpp	Sat Nov 30 17:27:47 2002
@@ -29,7 +29,7 @@
 #include "gr_UnixGraphics.h"
 
 #include "xap_App.h"
-#include "xap_UnixGnomeApp.h"
+#include "gnome/xap_UnixGnomeApp.h"
 #include "xap_UnixFrame.h"
 
 #include "xap_Dialog_Id.h"
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_PrintPreview.h	Thu Nov 30 01:02:21 2000
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_PrintPreview.h	Sat Nov 30 17:27:47 2002
@@ -31,7 +31,7 @@
 #include "xap_UnixFrame.h"
 
 #include "xap_Dlg_PrintPreview.h"
-#include "xap_UnixGnomePrintGraphics.h"
+#include "gnome/xap_UnixGnomePrintGraphics.h"
 
 /*****************************************************************/
 
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeApp.cpp	Mon Apr 15 15:58:01 2002
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeApp.cpp	Sat Nov 30 17:27:47 2002
@@ -30,7 +30,7 @@
 
 #include "xap_Args.h"
 #include "xap_UnixApp.h"
-#include "xap_UnixGnomeApp.h"
+#include "gnome/xap_UnixGnomeApp.h"
 #include "xap_FakeClipboard.h"
 #include "gr_UnixImage.h"
 #include "xap_UnixFrame.h"
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Print.cpp	Mon Dec  3 19:28:36 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Print.cpp	Sat Nov 30 17:27:47 2002
@@ -26,7 +26,7 @@
 #include "xap_UnixDialogHelper.h"
 #include "xap_Dialog_Id.h"
 #include "xap_UnixDlg_Print.h"
-#include "xap_UnixGnomeDlg_Print.h"
+#include "gnome/xap_UnixGnomeDlg_Print.h"
 #include "xap_UnixDlg_MessageBox.h"
 #include "xap_UnixApp.h"
 #include "xap_UnixFrame.h"
@@ -35,7 +35,7 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 
-#include "xap_UnixGnomePrintGraphics.h"
+#include "gnome/xap_UnixGnomePrintGraphics.h"
 
 extern "C" {
 #include <libgnomeprint/gnome-print-dialog.h>
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Password.cpp	Mon Dec  3 19:28:36 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Password.cpp	Sat Nov 30 17:27:47 2002
@@ -29,13 +29,13 @@
 #include "xap_UnixDialogHelper.h"
 
 #include "xap_App.h"
-#include "xap_UnixGnomeApp.h"
-#include "xap_UnixGnomeFrame.h"
+#include "gnome/xap_UnixGnomeApp.h"
+#include "gnome/xap_UnixGnomeFrame.h"
 
 #include "xap_Strings.h"
 #include "xap_Dialog_Id.h"
 #include "xap_Dlg_Password.h"
-#include "xap_UnixGnomeDlg_Password.h"
+#include "gnome/xap_UnixGnomeDlg_Password.h"
 
 /*****************************************************************/
 
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_PluginManager.cpp	Mon Dec  3 19:28:36 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_PluginManager.cpp	Sat Nov 30 17:27:47 2002
@@ -20,7 +20,7 @@
 #include <gnome.h>
 #include "xap_Dialog_Id.h"
 #include "xap_Strings.h"
-#include "xap_UnixGnomeDlg_PluginManager.h"
+#include "gnome/xap_UnixGnomeDlg_PluginManager.h"
 #include "xap_UnixDialogHelper.h"
 
 XAP_Dialog * XAP_UnixGnomeDialog_PluginManager::static_constructor(XAP_DialogFactory * pFactory,
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Encoding.cpp	Mon Dec  3 19:28:36 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Encoding.cpp	Sat Nov 30 17:27:47 2002
@@ -29,12 +29,12 @@
 #include "xap_UnixDialogHelper.h"
 
 #include "xap_App.h"
-#include "xap_UnixGnomeApp.h"
-#include "xap_UnixGnomeFrame.h"
+#include "gnome/xap_UnixGnomeApp.h"
+#include "gnome/xap_UnixGnomeFrame.h"
 
 #include "xap_Strings.h"
 #include "xap_Dialog_Id.h"
-#include "xap_UnixGnomeDlg_Encoding.h"
+#include "gnome/xap_UnixGnomeDlg_Encoding.h"
 
 /*****************************************************************/
 
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_PrintPreview.cpp	Sun Dec 17 19:51:01 2000
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_PrintPreview.cpp	Sat Nov 30 17:27:47 2002
@@ -24,7 +24,7 @@
 #include "ut_string.h"
 #include "ut_debugmsg.h"
 #include "xap_Dialog_Id.h"
-#include "xap_UnixGnomeDlg_PrintPreview.h"
+#include "gnome/xap_UnixGnomeDlg_PrintPreview.h"
 #include "xap_Frame.h"
 #include "xap_DialogFactory.h"
 
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_MessageBox.cpp	Mon Dec  3 19:28:36 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_MessageBox.cpp	Sat Nov 30 17:27:47 2002
@@ -22,7 +22,7 @@
 #include "ut_vector.h"
 #include "xap_UnixDialogHelper.h"
 #include "xap_UnixDlg_MessageBox.h"
-#include "xap_UnixGnomeDlg_MessageBox.h"
+#include "gnome/xap_UnixGnomeDlg_MessageBox.h"
 #include "xap_UnixApp.h"
 #include "xap_UnixFrame.h"
 
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomePrintGraphics.cpp	Tue May 14 03:44:26 2002
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomePrintGraphics.cpp	Sat Nov 30 17:27:47 2002
@@ -29,7 +29,7 @@
 #include "ut_string.h"
 #include "ut_misc.h"
 #include "xap_Strings.h"
-#include "xap_UnixGnomePrintGraphics.h"
+#include "gnome/xap_UnixGnomePrintGraphics.h"
 #include "xap_EncodingManager.h"
 #include "gr_UnixGnomeImage.h"
 #include "ut_string_class.h"
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Insert_Symbol.cpp	Mon Dec  3 19:28:36 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Insert_Symbol.cpp	Sat Nov 30 17:27:47 2002
@@ -42,7 +42,7 @@
 #include "xap_Dialog_Id.h"
 #include "xap_Dlg_Insert_Symbol.h"
 #include "xap_UnixDlg_Insert_Symbol.h"
-#include "xap_UnixGnomeDlg_Insert_Symbol.h"
+#include "gnome/xap_UnixGnomeDlg_Insert_Symbol.h"
 
 /*****************************************************************/
 
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Stub.cpp	Mon Dec  3 19:28:36 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Stub.cpp	Sat Nov 30 17:27:47 2002
@@ -29,13 +29,13 @@
 #include "xap_UnixDialogHelper.h"
 
 #include "xap_App.h"
-#include "xap_UnixGnomeApp.h"
-#include "xap_UnixGnomeFrame.h"
+#include "gnome/xap_UnixGnomeApp.h"
+#include "gnome/xap_UnixGnomeFrame.h"
 
 #include "xap_Strings.h"
 #include "xap_Dialog_Id.h"
 #include "xap_Dlg_Stub.h"
-#include "xap_UnixGnomeDlg_Stub.h"
+#include "gnome/xap_UnixGnomeDlg_Stub.h"
 
 /*****************************************************************/
 
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Language.cpp	Mon Dec  3 19:28:36 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Language.cpp	Sat Nov 30 17:27:47 2002
@@ -20,7 +20,7 @@
 #include <gnome.h>
 #include "xap_Dialog_Id.h"
 #include "xap_Strings.h"
-#include "xap_UnixGnomeDlg_Language.h"
+#include "gnome/xap_UnixGnomeDlg_Language.h"
 #include "xap_UnixDialogHelper.h"
 
 XAP_Dialog * XAP_UnixGnomeDialog_Language::static_constructor(XAP_DialogFactory * pFactory,
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_ClipArt.cpp	Mon Dec  3 19:28:36 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_ClipArt.cpp	Sat Nov 30 17:27:47 2002
@@ -19,7 +19,7 @@
 
 #include "xap_Strings.h"
 #include "xap_Dialog_Id.h"
-#include "xap_UnixGnomeDlg_ClipArt.h"
+#include "gnome/xap_UnixGnomeDlg_ClipArt.h"
 #include "xap_UnixDialogHelper.h"
 #include "xap_UnixFrame.h"
 #include "xap_App.h"
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Image.cpp	Mon Dec  3 19:28:36 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Image.cpp	Sat Nov 30 17:27:47 2002
@@ -25,7 +25,7 @@
 #include "ap_Strings.h"
 #include "xap_UnixDialogHelper.h"
 
-#include "xap_UnixGnomeDlg_Image.h"
+#include "gnome/xap_UnixGnomeDlg_Image.h"
 
 static void
 cb_close (GtkWidget * w, XAP_UnixGnomeDialog_Image * dlg)
--- ./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_About.cpp	Wed Mar 27 09:27:58 2002
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_About.cpp	Sat Nov 30 17:27:47 2002
@@ -20,7 +20,7 @@
 #include <gnome.h>
 
 #include "xap_Dialog_Id.h"
-#include "xap_UnixGnomeDlg_About.h"
+#include "gnome/xap_UnixGnomeDlg_About.h"
 #include "xap_UnixDialogHelper.h"
 #include "xap_UnixFrame.h"
 #include "xap_App.h"
--- ./abi/src/af/xap/unix/xap_UnixDlg_Print.cpp	Sun Mar 10 20:38:36 2002
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/xap_UnixDlg_Print.cpp	Sat Nov 30 17:27:47 2002
@@ -450,7 +450,7 @@
 
 			m_persistPrintDlg.colorSpace = GR_Graphics::GR_COLORSPACE_COLOR;
 			
-			UT_cloneString(m_persistPrintDlg.szPrintCommand, "lpr");
+			UT_cloneString(m_persistPrintDlg.szPrintCommand, "lp");
 		}
 
 		// Turn some widgets on or off based on settings
--- ./abi/src/af/xap/unix/xap_UnixFont.cpp	Wed Jul 31 18:35:21 2002
+++ ../abiword-1.0.3/./abi/src/af/xap/unix/xap_UnixFont.cpp	Sat Nov 30 17:27:47 2002
@@ -197,7 +197,8 @@
 	for(UT_uint32 i =0; i < m_allocFonts.getItemCount(); i++)
 	{
 		allocFont * p = (allocFont *) m_allocFonts.getNthItem(i);
-		gdk_font_unref(p->gdkFont);
+		// Freeing the last font causes a SEGV?
+		//gdk_font_unref(p->gdkFont);
 		delete p;
 	}
 	if(m_uniWidths)
--- ./abi/src/af/xap/cocoa/xap_CocoaDlg_Print.mm	Tue Dec 18 16:07:34 2001
+++ ../abiword-1.0.3/./abi/src/af/xap/cocoa/xap_CocoaDlg_Print.mm	Sat Nov 30 17:27:47 2002
@@ -450,7 +450,7 @@
 
 			m_persistPrintDlg.colorSpace = GR_Graphics::GR_COLORSPACE_COLOR;
 			
-			UT_cloneString(m_persistPrintDlg.szPrintCommand, "lpr");
+			UT_cloneString(m_persistPrintDlg.szPrintCommand, "lp");
 		}
 
 		// Turn some widgets on or off based on settings
--- ./abi/src/wp/ap/unix/ap_UnixDialog_All.h	Fri Nov 16 16:24:24 2001
+++ ../abiword-1.0.3/./abi/src/wp/ap/unix/ap_UnixDialog_All.h	Sat Nov 30 17:27:48 2002
@@ -71,18 +71,18 @@
 #	include "ap_UnixDialog_InsertHyperlink.h"
 
 #ifdef HAVE_GNOME
-#	include "xap_UnixGnomeDlg_About.h"
-#   include "xap_UnixGnomeDlg_ClipArt.h"
-#	include "xap_UnixGnomeDlg_FontChooser.h"
-#	include "xap_UnixGnomeDlg_Insert_Symbol.h"
-#	include "xap_UnixGnomeDlg_MessageBox.h"
-#   include "xap_UnixGnomeDlg_Print.h"
-#   include "xap_UnixGnomeDlg_PrintPreview.h"
+#	include "gnome/xap_UnixGnomeDlg_About.h"
+#   include "gnome/xap_UnixGnomeDlg_ClipArt.h"
+#	include "gnome/xap_UnixGnomeDlg_FontChooser.h"
+#	include "gnome/xap_UnixGnomeDlg_Insert_Symbol.h"
+#	include "gnome/xap_UnixGnomeDlg_MessageBox.h"
+#   include "gnome/xap_UnixGnomeDlg_Print.h"
+#   include "gnome/xap_UnixGnomeDlg_PrintPreview.h"
 #	include "xap_UnixGnomeDlg_Zoom.h"
-#   include "xap_UnixGnomeDlg_Language.h"
-#   include "xap_UnixGnomeDlg_PluginManager.h"
-#include "xap_UnixGnomeDlg_Password.h"
-#include "xap_UnixGnomeDlg_Image.h"
+#   include "gnome/xap_UnixGnomeDlg_Language.h"
+#   include "gnome/xap_UnixGnomeDlg_PluginManager.h"
+#include "gnome/xap_UnixGnomeDlg_Password.h"
+#include "gnome/xap_UnixGnomeDlg_Image.h"
 
 #   include "ap_UnixGnomeDialog_Break.h"
 #	include "ap_UnixGnomeDialog_Replace.h"
--- ./abi/src/wp/ap/unix/gnome/ap_UnixGnomeApp.cpp	Sun Sep  8 21:03:53 2002
+++ ../abiword-1.0.3/./abi/src/wp/ap/unix/gnome/ap_UnixGnomeApp.cpp	Sat Nov 30 17:27:48 2002
@@ -75,7 +75,7 @@
 #include <libgnomeui/gnome-window-icon.h>
 
 #include "xap_UnixPSGraphics.h"
-#include "xap_UnixGnomePrintGraphics.h"
+#include "gnome/xap_UnixGnomePrintGraphics.h"
 #include "ap_EditMethods.h"
 
 #include "xap_Prefs.h"
@@ -156,7 +156,7 @@
 	 {"to", 't', POPT_ARG_STRING, &to, 0, "The target format of the file (abw, zabw, rtf, txt, utf8, html, latex)", "FORMAT"},
 	 {"to-png", '\0', POPT_ARG_NONE, &topng, 0, "Convert the incoming file to a PNG image", ""},
 	 {"verbose", 'v', POPT_ARG_INT, &verbose, 0, "The verbosity level (0, 1, 2)", "LEVEL"},
-	 {"print", 'p', POPT_ARG_STRING, &printto, 0, "print this file to a file or printer", "FILE or |lpr"},
+	 {"print", 'p', POPT_ARG_STRING, &printto, 0, "print this file to a file or printer", "FILE or |lp"},
 	 {"show", '\0', POPT_ARG_NONE, &show, 0, "If you really want to start the GUI (even if you use the --to option)", ""},
 	 {"plugin", '\0', POPT_ARG_NONE, &plugin, 0, "If you want to execute a plugin instead of the main application ", ""},
 	 {NULL, '\0', 0, NULL, 0, NULL, NULL} /* end the list */
--- ./abi/src/wp/ap/unix/ap_UnixFrame.h	Fri Apr 19 04:03:14 2002
+++ ../abiword-1.0.3/./abi/src/wp/ap/unix/ap_UnixFrame.h	Sat Nov 30 17:27:48 2002
@@ -23,7 +23,7 @@
 class GR_Graphics;
 
 #ifdef HAVE_GNOME
-#include "xap_UnixGnomeFrame.h"
+#include "gnome/xap_UnixGnomeFrame.h"
 #define XAP_UNIXBASEFRAME XAP_UnixGnomeFrame
 #else
 #include "xap_UnixFrame.h"
--- ./abi/src/wp/ap/unix/ap_UnixDialog_New.cpp	Mon Jun 17 03:50:00 2002
+++ ../abiword-1.0.3/./abi/src/wp/ap/unix/ap_UnixDialog_New.cpp	Sat Nov 30 17:27:48 2002
@@ -235,7 +235,7 @@
 
 // return > 0 for directory entries ending in ".awt" and ".dot"
 #if defined (__APPLE__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
-	|| defined(_AIX)
+	|| defined(_AIX) || defined(__sgi)
 static int awt_only (struct dirent *d)
 #elif defined(__osf__)
 // The Tru64 UNIX vendor C++ compiler will complain when scandir is
--- ./abi/src/wp/ap/unix/ap_UnixApp.h	Thu May  2 21:49:29 2002
+++ ../abiword-1.0.3/./abi/src/wp/ap/unix/ap_UnixApp.h	Sat Nov 30 17:27:48 2002
@@ -33,7 +33,7 @@
 #include "pt_Types.h"
 
 #ifdef HAVE_GNOME
-#include "xap_UnixGnomeApp.h"
+#include "gnome/xap_UnixGnomeApp.h"
 #define XAP_UNIXBASEAPP XAP_UnixGnomeApp
 #else
 #include "xap_UnixApp.h"
--- ./abi/src/wp/ap/unix/ap_UnixApp.cpp	Tue Jul 23 10:39:53 2002
+++ ../abiword-1.0.3/./abi/src/wp/ap/unix/ap_UnixApp.cpp	Sat Nov 30 17:27:48 2002
@@ -587,7 +587,7 @@
 
 // return > 0 for directory entries ending in ".so"
 #if defined (__APPLE__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
-	|| defined(_AIX)
+	|| defined(_AIX) || defined(__sgi)
 static int so_only (struct dirent *d)
 #elif defined(__osf__)
 // The Tru64 UNIX vendor C++ compiler will complain when scandir is
--- ./abi/src/wp/ap/unix/ap_UnixFrame.cpp	Fri Apr 19 04:03:13 2002
+++ ../abiword-1.0.3/./abi/src/wp/ap/unix/ap_UnixFrame.cpp	Sat Nov 30 17:27:48 2002
@@ -25,7 +25,7 @@
 #include "xap_ViewListener.h"
 #include "ap_FrameData.h"
 #ifdef HAVE_GNOME
-#include "xap_UnixGnomeFrame.h"
+#include "gnome/xap_UnixGnomeFrame.h"
 #else
 #include "xap_UnixFrame.h"
 #endif
--- ./abi/src/wp/main/unix/GNUmakefile.am	Wed Jun 26 07:03:42 2002
+++ ../abiword-1.0.3/./abi/src/wp/main/unix/GNUmakefile.am	Mon Dec  2 11:44:00 2002
@@ -39,8 +39,8 @@
 
 REPEAT_LIBS = $(ABI_LIBS) $(ABI_LIBS) $(ABI_LIBS) $(ABI_LIBS)
 
-AbiWord_d_LDADD = $(REPEAT_LIBS) @GTK_LIBS@ @GMODULE_LIBS@ $(OTHER_LIBS) 
-AbiWord_s_LDADD = $(REPEAT_LIBS) @GTK_LIBS@ @GMODULE_LIBS@ $(OTHER_LIBS) 
+AbiWord_d_LDADD = $(REPEAT_LIBS) $(OTHER_LIBS) @GTK_LIBS@ @GMODULE_LIBS@
+AbiWord_s_LDADD = $(REPEAT_LIBS) $(OTHER_LIBS) @GTK_LIBS@ @GMODULE_LIBS@
 
 abi_ver.cpp:
 	cp $(srcdir)/../xp/abi_ver.cpp .
--- ./abi/src/wp/main/unix/GNUmakefile.in	Wed Sep 11 20:26:29 2002
+++ ../abiword-1.0.3/./abi/src/wp/main/unix/GNUmakefile.in	Mon Dec  2 11:44:20 2002
@@ -219,8 +219,8 @@
 
 @WITH_GNOME_FALSE@REPEAT_LIBS = $(ABI_LIBS) $(ABI_LIBS) $(ABI_LIBS) $(ABI_LIBS)
 
-@WITH_GNOME_FALSE@AbiWord_d_LDADD = $(REPEAT_LIBS) @GTK_LIBS@ @GMODULE_LIBS@ $(OTHER_LIBS) 
-@WITH_GNOME_FALSE@AbiWord_s_LDADD = $(REPEAT_LIBS) @GTK_LIBS@ @GMODULE_LIBS@ $(OTHER_LIBS) 
+@WITH_GNOME_FALSE@AbiWord_d_LDADD = $(REPEAT_LIBS) $(OTHER_LIBS) @GTK_LIBS@ @GMODULE_LIBS@
+@WITH_GNOME_FALSE@AbiWord_s_LDADD = $(REPEAT_LIBS) $(OTHER_LIBS) @GTK_LIBS@ @GMODULE_LIBS@
 subdir = src/wp/main/unix
 mkinstalldirs = $(SHELL) $(top_srcdir)/ac-helpers/mkinstalldirs
 CONFIG_CLEAN_FILES =
--- ./abi/src/other/spell/xp/pspell_checker.cpp	Sun Aug 18 00:31:27 2002
+++ ../abiword-1.0.3/./abi/src/other/spell/xp/pspell_checker.cpp	Sun Dec  1 01:38:40 2002
@@ -52,7 +52,7 @@
   UT_String buf; // evil hardcoded buffer size
   const char * text = pSS->getValue (XAP_STRING_ID_DICTIONARY_CANTLOAD);
   UT_String_sprintf(buf, text, szLang);
-  char *cbuf = buf.c_str();
+  const char *cbuf = buf.c_str();
   pFrame->showMessageBox (cbuf,
 			  XAP_Dialog_MessageBox::b_O,
 			  XAP_Dialog_MessageBox::a_OK);
--- ./abi/src/config/require/unix/Makefile	Fri Jun 21 06:36:45 2002
+++ ../abiword-1.0.3/./abi/src/config/require/unix/Makefile	Sat Nov 30 17:27:48 2002
@@ -107,6 +107,7 @@
 	      -o -r ${X11BASE}/lib/libpng.a			\
 	      -o -r /usr/X11R6/lib/libpng.a			\
 	      -o -r /opt/libpng/lib/libpng.a			\
+	      -o -r ${ROOT}/usr/freeware/lib32/libpng.so	\
 	    ]; then						\
 		echo Found libpng in system directories;	\
 	else							\