diff options
| author | Bryan Quigley <gquigs@gmail.com> | 2015-12-02 00:02:59 -0500 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-12-17 13:56:22 +0000 |
| commit | eaa7f30102df4df01171e5daf83cdddae1bb0cda (patch) | |
| tree | 30e11f649cf26ab238132a979146b8111bbb37f2 /shell | |
| parent | b7842c93dc06b831d3fa649410ed847358ce9d17 (diff) | |
Remove gnome-open support
Gnome-open has been deprecate for some time. xdg-open replaces it.
Change-Id: I7fc0f32a1f2fbadbe3d1cee58d0089213665c3a5
Reviewed-on: https://gerrit.libreoffice.org/20347
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Module_shell.mk | 1 | ||||
| -rw-r--r-- | shell/Package_scripts_gnome.mk | 14 | ||||
| -rwxr-xr-x | shell/source/unix/misc/gnome-open-url.sh | 4 | ||||
| -rwxr-xr-x | shell/source/unix/misc/senddoc.sh | 2 |
4 files changed, 0 insertions, 21 deletions
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 44d0a617f270..d0a3318ca15c 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -106,7 +106,6 @@ ifeq ($(USING_X11),TRUE) $(eval $(call gb_Module_add_targets,shell,\ Library_recentfile \ Package_scripts \ - Package_scripts_gnome \ Package_scripts_kde \ Package_scripts_tde \ )) diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk deleted file mode 100644 index 794ed871e13d..000000000000 --- a/shell/Package_scripts_gnome.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,shell_scripts_gnome,$(SRCDIR)/shell/source/unix/misc)) - -$(eval $(call gb_Package_add_file,shell_scripts_gnome,$(LIBO_BIN_FOLDER)/gnome-open-url,gnome-open-url.sh)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/source/unix/misc/gnome-open-url.sh b/shell/source/unix/misc/gnome-open-url.sh deleted file mode 100755 index bffe6f27a783..000000000000 --- a/shell/source/unix/misc/gnome-open-url.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# use xdg-open or gnome-open if available, falling back to our own open-url -xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || `dirname "$0"`/open-url "$1" 2>/dev/null diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh index a6425462c70d..169af259f220 100755 --- a/shell/source/unix/misc/senddoc.sh +++ b/shell/source/unix/misc/senddoc.sh @@ -389,8 +389,6 @@ case `basename "$MAILER" | sed 's/-.*$//'` in MAILER=${DESKTOP_LAUNCH} elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then MAILER=/usr/bin/kde-open - elif [ -n "$GNOME_DESKTOP_SESSION_ID" -a -x /usr/bin/gnome-open ] ; then - MAILER=/usr/bin/gnome-open elif [ -x /usr/bin/xdg-open ] ; then MAILER=/usr/bin/xdg-open else |