[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - shell/source

Andras Timar andras.timar at collabora.com
Mon Apr 24 11:27:32 UTC 2017


 shell/source/unix/misc/open-url.sh |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 20a87b885fdc52939d39db4ea9636a51b7ced6a7
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Apr 24 13:26:59 2017 +0200

    open-url script, don't use -remote, reportedly this works better
    
    Change-Id: I6933ca624324afff1f7a98f6407112685e9a4aaf

diff --git a/shell/source/unix/misc/open-url.sh b/shell/source/unix/misc/open-url.sh
index 98a4d3fe00bc..8cfcf0e09358 100755
--- a/shell/source/unix/misc/open-url.sh
+++ b/shell/source/unix/misc/open-url.sh
@@ -33,18 +33,7 @@ which() {
 # checks for the original mozilla start script(s)
 # and restrict the "-remote" semantics to those.
 run_mozilla() {
-  if file "$1" | grep script > /dev/null && grep NPL "$1" > /dev/null; then
-    "$1" -remote 'ping()' 2>/dev/null >/dev/null
-    if [ $? -eq 2 ]; then
-      "$1" "$2" &
-    else
-      "$1" -remote \
-        "openURL($(printf '%s' "$2" \
-          | sed -e 's/(/%28/g' -e 's/)/%29/g' -e 's/,/%2C/g'),new-window)" &
-    fi
-  else
-    "$1" "$2" &
-  fi
+    "$1" -new-tab "$2" &
 }
 
 # special handling for mailto: uris


More information about the Libreoffice-commits mailing list