? .STAROFFICE.swp
? ChangeLog.flc
? STAROFFICE
? autom4te.cache
? stamp-h1
? staroffice-extra-mime.diff
Index: gnome-vfs.applications
===================================================================
RCS file: /cvs/gnome/gnome-mime-data/gnome-vfs.applications,v
retrieving revision 1.45
diff -u -r1.45 gnome-vfs.applications
--- gnome-vfs.applications	25 Apr 2002 22:54:20 -0000	1.45
+++ gnome-vfs.applications	24 May 2002 11:35:39 -0000
@@ -378,6 +378,14 @@
 	requires_terminal=false
 	mime_types=video/mpeg,video/x-msvideo,audio/ac3
 
+openoffice
+	command=ooffice
+	name=OpenOffice.org
+	can_open_multiple_files=true
+	expects_uris=false
+	requires_terminal=false
+	mime_types=text/abiword,application/x-abiword,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template
+
 pico
 	command=jpico --help
 	name=jpico
Index: gnome-vfs.keys.in
===================================================================
RCS file: /cvs/gnome/gnome-mime-data/gnome-vfs.keys.in,v
retrieving revision 1.52
diff -u -r1.52 gnome-vfs.keys.in
--- gnome-vfs.keys.in	20 May 2002 19:42:19 -0000	1.52
+++ gnome-vfs.keys.in	24 May 2002 11:35:39 -0000
@@ -22,9 +22,9 @@
 application/msword
 	_description=Microsoft Word document
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=abiword,staroffice,applix
-	short_list_application_ids_for_intermediate_user_level=abiword,staroffice,applix
-	short_list_application_ids_for_advanced_user_level=abiword,staroffice,applix
+	short_list_application_ids_for_novice_user_level=abiword,openoffice,staroffice,applix
+	short_list_application_ids_for_intermediate_user_level=abiword,openoffice,staroffice,applix
+	short_list_application_ids_for_advanced_user_level=abiword,openoffice,staroffice,applix
 	category=Documents/Word Processor
 	use_category_default=yes
 
@@ -90,9 +90,9 @@
 application/rtf
 	_description=rich text document
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=abiword,staroffice,applix
-	short_list_application_ids_for_intermediate_user_level=abiword,staroffice,applix
-	short_list_application_ids_for_advanced_user_level=abiword,staroffice,applix
+	short_list_application_ids_for_novice_user_level=abiword,openoffice,staroffice,applix
+	short_list_application_ids_for_intermediate_user_level=abiword,openoffice,staroffice,applix
+	short_list_application_ids_for_advanced_user_level=abiword,openoffice,staroffice,applix
 	category=Documents/Word Processor
 	use_category_default=yes
 
@@ -110,18 +110,18 @@
 	_description=Microsoft Excel spreadsheet
 	icon_filename=i-spreadsheet
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=gnumeric,staroffice,applix
-	short_list_application_ids_for_intermediate_user_level=gnumeric,staroffice,applix
-	short_list_application_ids_for_advanced_user_level=gnumeric,staroffice,applix
+	short_list_application_ids_for_novice_user_level=gnumeric,openoffice,staroffice,applix
+	short_list_application_ids_for_intermediate_user_level=gnumeric,openoffice,staroffice,applix
+	short_list_application_ids_for_advanced_user_level=gnumeric,openoffice,staroffice,applix
 	category=Documents/Spreadsheet
 	use_category_default=yes
 
 application/vnd.ms-powerpoint
 	_description=Microsoft PowerPoint document
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents/Presentation
 	use_category_default=yes
 
@@ -139,63 +139,63 @@
 application/vnd.stardivision.calc
 	_description=StarCalc spreadsheet
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents/Spreadsheet
 	use_category_default=yes
 
 application/vnd.stardivision.chart
 	_description=StarChart chart
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents
 	use_category_default=no
 
 application/vnd.stardivision.draw
 	_description=StarDraw drawing
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents
 	use_category_default=no
 
 application/vnd.stardivision.impress
 	_description=StarImpress presentation
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents/Presentation
 	use_category_default=yes
 
 application/vnd.stardivision.mail
 	_description=StarMail file
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents
 	use_category_default=no
 
 application/vnd.stardivision.math
 	_description=StarMath document
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents
 	use_category_default=no
 
 application/vnd.stardivision.writer
 	_description=StarWriter document
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents/Word Processor
 	use_category_default=yes
 
@@ -204,90 +204,90 @@
 application/vnd.sun.xml.calc
 	_description=OpenOffice.org spreadsheet
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents/Spreadsheet
 	use_category_default=yes
 
 application/vnd.sun.xml.calc.template
 	_description=OpenOffice.org spreadsheet template
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents/Spreadsheet
 	use_category_default=yes
 
 application/vnd.sun.xml.draw
 	_description=OpenOffice.org drawing
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents
 	use_category_default=no
 
 application/vnd.sun.xml.draw.template
 	_description=OpenOffice.org drawing template
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents
 	use_category_default=no
 
 application/vnd.sun.xml.impress
 	_description=OpenOffice.org Impress presentation
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents/Presentation
 	use_category_default=yes
 
 application/vnd.sun.xml.impress.template
 	_description=OpenOffice.org Impress presentation template
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents/Presentation
 	use_category_default=yes
 
 application/vnd.sun.xml.math
 	_description=OpenOffice.org Math document
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents
 	use_category_default=no
 
 application/vnd.sun.xml.writer
 	_description=OpenOffice.org Writer document
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents/Word Processor
 	use_category_default=yes
 
 application/vnd.sun.xml.writer.global
 	_description=OpenOffice.org Writer global document
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents/Word Processor
 	use_category_default=yes
 
 application/vnd.sun.xml.writer.template
 	_description=OpenOffice.org Writer template
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=staroffice
-	short_list_application_ids_for_intermediate_user_level=staroffice
-	short_list_application_ids_for_advanced_user_level=staroffice
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
 	category=Documents/Word Processor
 	use_category_default=yes
 
@@ -297,9 +297,9 @@
 application/x-abiword
 	_description=AbiWord document
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=abiword,staroffice
-	short_list_application_ids_for_intermediate_user_level=abiword,staroffice
-	short_list_application_ids_for_advanced_user_level=abiword,staroffice
+	short_list_application_ids_for_novice_user_level=abiword,openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=abiword,openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=abiword,openoffice,staroffice
 	category=Documents/Word Processor
 	use_category_default=yes
 
@@ -1091,6 +1091,12 @@
 	short_list_application_ids_for_advanced_user_level=gimp
 	icon_filename=gnome-image-xcf
 
+image/x-emf
+	_description=StarOffice extended metafile image
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
+
 image/x-ico
 	_description=Windows icon image
 
@@ -1106,6 +1112,24 @@
 image/x-lws
 	_description=LightWave scene
 
+image/x-pcx
+	_description=PC Paintbrush image
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
+
+image/x-photo-cd
+	_description=Photo CD image
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
+
+image/x-pict
+	_description=PICT image
+	short_list_application_ids_for_novice_user_level=openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=openoffice,staroffice
+
 # also image/png
 image/x-png
 	_description=PNG image
@@ -1288,9 +1312,9 @@
 text/abiword
 	_description=AbiWord document
 	default_action_type=application
-	short_list_application_ids_for_novice_user_level=abiword,staroffice
-	short_list_application_ids_for_intermediate_user_level=abiword,staroffice
-	short_list_application_ids_for_advanced_user_level=abiword,staroffice
+	short_list_application_ids_for_novice_user_level=abiword,openoffice,staroffice
+	short_list_application_ids_for_intermediate_user_level=abiword,openoffice,staroffice
+	short_list_application_ids_for_advanced_user_level=abiword,openoffice,staroffice
 	category=Documents/Word Processor
 	use_category_default=yes
 
Index: gnome-vfs.mime
===================================================================
RCS file: /cvs/gnome/gnome-mime-data/gnome-vfs.mime,v
retrieving revision 1.40
diff -u -r1.40 gnome-vfs.mime
--- gnome-vfs.mime	24 May 2002 02:36:04 -0000	1.40
+++ gnome-vfs.mime	24 May 2002 11:35:39 -0000
@@ -448,6 +448,9 @@
 	regex,2: \.xcf\.gz$
 	regex,2: \.xcf\.bz2$
 
+image/x-emf
+	ext: emf
+
 image/x-ico
 	ext: ico
 
@@ -462,6 +465,15 @@
 
 image/x-lws
 	ext: lws
+
+image/x-pcx
+	ext: pcx
+
+image/x-photo-cd
+	ext: pcd
+
+image/x-pict
+	ext: pct
 
 image/x-portable-anymap
 	ext: pnm
