ooo-build r11950 - in trunk: . desktop patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Wed Mar 19 16:27:39 2008
New Revision: 11950
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11950&view=rev

Log:
2008-03-19  Petr Mladek  <pmladek suse cz>

	* patches/src680/shell-senddoc-moz-wrapper-symlink.diff:
	* patches/src680/apply: detect the symlinked mozilla-like wrapper
	  correctly; fixes "File/Send/Document as E-mail..." to work correctly
	  with seamonkey on openSUSE-10.3, n#368532, i#87258

	* desktop/openoffice.xml: remove the sub-class definition from
	  application/vnd.openofficeorg.extension MIME; it somewhat preferred
	  unzip-like apps rather than OOo ;-)



Added:
   trunk/patches/src680/shell-senddoc-moz-wrapper-symlink.diff
Modified:
   trunk/ChangeLog
   trunk/desktop/openoffice.xml
   trunk/patches/src680/apply

Modified: trunk/desktop/openoffice.xml
==============================================================================
--- trunk/desktop/openoffice.xml	(original)
+++ trunk/desktop/openoffice.xml	Wed Mar 19 16:27:39 2008
@@ -159,7 +159,6 @@
     <glob pattern="*.wps"/>
   </mime-type>
   <mime-type type="application/vnd.openofficeorg.extension">
-    <sub-class-of type="application/zip"/>
     <comment>OpenOffice.org extension</comment>
     <glob pattern="*.oxt" />
   </mime-type>

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Mar 19 16:27:39 2008
@@ -361,6 +361,10 @@
 # allow to send documents with a space in the name via sylpheed-claws
 shell-senddoc-sylpheed-filenames.diff, n#362773, i#86887, pmladek
 
+# detect the symlinked mozilla-like wrapper correctly; fixes "File/Send/Document as E-mail..."
+# to work correctly with seamonkey on openSUSE-10.3
+shell-senddoc-moz-wrapper-symlink.diff, n#368532, i#87258, pmladek
+
 # add some shortcuts to Impress + needed fixes. bug n#352330
 sd-text-shortcut-n352330.diff, i#85247, n#352330, hub
 svx-text-move-fix-i59061.diff, i#59061, hub

Added: trunk/patches/src680/shell-senddoc-moz-wrapper-symlink.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/shell-senddoc-moz-wrapper-symlink.diff	Wed Mar 19 16:27:39 2008
@@ -0,0 +1,11 @@
+--- shell/source/unix/misc/senddoc.sh.old	2008-03-19 15:24:48.000000000 +0100
++++ shell/source/unix/misc/senddoc.sh	2008-03-19 16:46:00.000000000 +0100
+@@ -27,7 +27,7 @@ run_mozilla() {
+ 		moz=$1
+ 	fi
+ 
+-	if file "$moz" | grep "script" > /dev/null && grep "[NM]PL" "$moz" > /dev/null; then
++	if file -L "$moz" | grep "script" > /dev/null && grep "[NM]PL" "$moz" > /dev/null; then
+ 		"$moz" -remote 'ping()' 2>/dev/null >/dev/null
+ 		if [ $? -eq 2 ]; then
+ 			"$1" -compose "$2" &