diff -ur xdg-utils.new/scripts/xdg-email.in xdg-utils.orig/scripts/xdg-email.in --- xdg-utils.new/scripts/xdg-email.in 2017-08-30 08:21:24.000000000 +0200 +++ xdg-utils.orig/scripts/xdg-email.in 2017-08-30 08:33:12.000000000 +0200 @@ -133,28 +133,6 @@ fi } -open_tde() -{ - - local command=tdemailservice - - if which $command >/dev/null 2>&1; then - DEBUG 1 "Running $command \"$1\"" - # TDE uses locale's encoding when decoding the URI, - # so set it to UTF-8 - LC_ALL=C.UTF-8 $command "$1" - else - DEBUG 1 "$command missing; trying generic mode instead." - open_generic "$1" - fi - - if [ $? = 0 ]; then - exit_success - else - exit_failure_operation_failed - fi -} - open_gnome3() { local client @@ -490,10 +468,6 @@ open_kde "${mailto}" ;; - tde) - open_tde "${mailto}" - ;; - gnome) open_gnome "${mailto}" ;; diff -ur xdg-utils.new/scripts/xdg-mime.in xdg-utils.orig/scripts/xdg-mime.in --- xdg-utils.new/scripts/xdg-mime.in 2017-11-30 02:26:28.913288645 +0100 +++ xdg-utils.orig/scripts/xdg-mime.in 2017-08-30 08:33:12.000000000 +0200 @@ -38,11 +38,6 @@ DEBUG 1 "Running kbuildsycoca" eval 'kbuildsycoca${KDE_SESSION_VERSION}'$xdg_redirect_output fi - - if [ x"$DE" = x"tde" ] ; then - DEBUG 1 "Running tdebuildsycoca" - eval 'tdebuildsycoca'$xdg_redirect_output - fi fi for x in `echo "$PATH:/opt/gnome/bin" | sed 's/:/ /g'`; do if [ -x $x/update-mime-database ] ; then @@ -78,19 +73,6 @@ fi } -info_tde() -{ - - DEBUG 1 "Running tdefile \"$1\"" - tdefile "$1" 2> /dev/null | head -n 1 | cut -d "(" -f 2 | cut -d ")" -f 1 - - if [ $? -eq 0 ]; then - exit_success - else - exit_failure_operation_failed - fi -} - info_gnome() { if gio help info 2>/dev/null 1>&2; then @@ -255,62 +237,6 @@ fi } -make_default_tde() -{ - # $1 is vendor-name.desktop - # $2 is mime/type - # - # On TDE, add to $TDE_CONFIG_PATH/profilerc: - # [$2 - 1] - # Application=$1 - # - # Remove all [$2 - *] sections, or even better, - # renumber [$2 - *] sections and remove duplicate - # - - vendor="$1" - mimetype="$2" - - default_dir=`tde-config --path config 2> /dev/null | cut -d ':' -f 1` - default_file="$default_dir/profilerc" - - if [ -z "$default_dir" ]; then - DEBUG 2 "make_default_tde: No tde runtime detected" - return - fi - DEBUG 2 "make_default_tde $vendor $mimetype" - DEBUG 1 "Updating $default_file" - mkdir -p "$default_dir" - [ -f "$default_file" ] || touch "$default_file" - - awk -v application="$vendor" -v mimetype="$mimetype" ' - BEGIN { - header_start="[" mimetype " - " - suppress=0 - } - { - if (index($0, header_start) == 1 ) - suppress=1 - else - if (/^\[/) { suppress=0 } - - if (!suppress) { - print $0 - } - } - END { - print "" - print "[" mimetype " - 1]" - print "Application=" application - print "AllowAsDefault=true" - print "GenericServiceType=Application" - print "Preference=1" - print "ServiceType=" mimetype - } -' "$default_file" > "${default_file}.new" && mv "${default_file}.new" "$default_file" - -} - make_default_generic() { # $1 is vendor-name.desktop @@ -537,27 +463,6 @@ fi } -defapp_tde() -{ - MIME="$1" - - KTRADER=`which tdetradertest 2> /dev/null` - - if [ -n "$KTRADER" ] ; then - DEBUG 1 "Running TDE trader query \"$MIME\" mimetype and \"Application\" servicetype" - trader_result=`$KTRADER "$MIME" Application 2>/dev/null \ - | grep -E "^DesktopEntryPath : |\.desktop$" | head -n1 | sed "s/^DesktopEntryPath : '\(.*\.desktop\)'\$/\1/"` - if [ -n "$trader_result" ] ; then - basename "$trader_result" - exit_success - else - exit_failure_operation_failed - fi - else - defapp_generic "$1" - fi -} - [ x"$1" != x"" ] || exit_failure_syntax mode= @@ -670,7 +575,6 @@ shift make_default_kde "$filename" "$mimetype" - make_default_tde "$filename" "$mimetype" make_default_generic "$filename" "$mimetype" done exit_success @@ -690,10 +594,6 @@ info_kde "$filename" ;; - tde) - info_tde "$filename" - ;; - gnome*|cinnamon|lxde|mate|xfce) info_gnome "$filename" ;; @@ -713,10 +613,6 @@ defapp_kde "$mimetype" ;; - tde) - defapp_tde "$mimetype" - ;; - *) defapp_generic "$mimetype" ;; diff -ur xdg-utils.new/scripts/xdg-open.in xdg-utils.orig/scripts/xdg-open.in --- xdg-utils.new/scripts/xdg-open.in 2017-08-30 04:56:56.000000000 +0200 +++ xdg-utils.orig/scripts/xdg-open.in 2017-08-30 08:33:12.000000000 +0200 @@ -142,18 +142,6 @@ fi } -open_tde() -{ - - kfmclient exec "$1" - - if [ $? -eq 0 ]; then - exit_success - else - exit_failure_operation_failed - fi -} - open_gnome3() { if gio help open 2>/dev/null 1>&2; then @@ -507,10 +495,6 @@ open_kde "$url" ;; - tde) - open_tde "$url" - ;; - gnome3|cinnamon) open_gnome3 "$url" ;; diff -ur xdg-utils.new/scripts/xdg-screensaver.in xdg-utils.orig/scripts/xdg-screensaver.in --- xdg-utils.new/scripts/xdg-screensaver.in 2017-08-30 05:06:18.000000000 +0200 +++ xdg-utils.orig/scripts/xdg-screensaver.in 2017-08-30 08:33:12.000000000 +0200 @@ -94,9 +94,6 @@ screensaver_kde3 "$1" fi ;; - tde) - screensaver_tde "$1" - ;; gnome_screensaver) screensaver_gnome_screensaver "$1" ;; @@ -334,55 +331,6 @@ { case "$1" in suspend) - dcop kdesktop KScreensaverIface enable false > /dev/null - result=$? - ;; - - resume) - dcop kdesktop KScreensaverIface configure > /dev/null - result=$? - ;; - - activate) - dcop kdesktop KScreensaverIface save > /dev/null - result=$? - ;; - - lock) - dcop kdesktop KScreensaverIface lock > /dev/null - result=$? - ;; - - reset) - # Turns the screensaver off right now - dcop kdesktop KScreensaverIface quit > /dev/null - result=$? - ;; - - status) - status=`dcop kdesktop KScreensaverIface isEnabled` - result=$? - if [ x"$status" = "xtrue" ]; then - echo "enabled" - elif [ x"$status" = "xfalse" ]; then - echo "disabled" - else - echo "ERROR: kdesktop KScreensaverIface isEnabled returned '$status'" >&2 - return 1 - fi - ;; - - *) - echo "ERROR: Unknown command '$1'" >&2 - return 1 - ;; - esac -} - -screensaver_tde() -{ - case "$1" in - suspend) dcop kdesktop KScreensaverIface enable false > /dev/null result=$? ;; diff -ur xdg-utils.new/scripts/xdg-settings.in xdg-utils.orig/scripts/xdg-settings.in --- xdg-utils.new/scripts/xdg-settings.in 2017-11-30 02:11:15.990182043 +0100 +++ xdg-utils.orig/scripts/xdg-settings.in 2017-08-30 08:33:12.000000000 +0200 @@ -103,13 +103,6 @@ # Only do this once, as we only need it once. XDG_MIME_FIXED=yes fi - - if [ "$DE" = tde -a -z "$XDG_MIME_FIXED" ]; then - ktradertest text/html Application > /dev/null 2>&1 - # Only do this once, as we only need it once. - XDG_MIME_FIXED=yes - fi - } get_browser_mime() @@ -175,24 +168,6 @@ } # }}} KDE utilities - -# {{{ TDE utilities - -read_tde_config() -{ - configfile="$1" - configsection="$2" - configkey="$3" - - application="`kreadconfig --file $configfile --group $configsection --key $configkey`" - - if [ x"$application" != x ]; then - echo "$application" - fi -} - -# }}} TDE utilities - # {{{ KDE # Resolves the KDE browser setting to a binary: if prefixed with !, simply removes it; @@ -278,91 +253,6 @@ } # }}} KDE - -# {{{ TDE - -# Resolves the TDE browser setting to a binary: if prefixed with !, simply removes it; -# otherwise, uses desktop_file_to_binary to get the binary out of the desktop file. -resolve_tde_browser() -{ - [ -z "$browser" ] && return - case "$browser" in - !*) - echo "${browser#!}" - ;; - *) - desktop_file_to_binary "$browser" - ;; - esac -} - -# Does the opposite of resolve_tde_browser: if prefixed with !, tries to find a desktop -# file corresponding to the binary, otherwise just returns the desktop file name. -resolve_tde_browser_desktop() -{ - [ -z "$browser" ] && return - case "$browser" in - !*) - desktop="`binary_to_desktop_file "${browser#!}"`" - basename "$desktop" - ;; - *) - echo "$browser" - ;; - esac -} - -read_tde_browser() -{ - read_tde_config kdeglobals General BrowserApplication -} - -get_browser_tde() -{ - browser="`read_tde_browser`" - if [ x"$browser" = x ]; then - # No explicit default browser; TDE will use the MIME type text/html. - get_browser_mime - else - resolve_tde_browser_desktop - fi -} - -check_browser_tde() -{ - check="`desktop_file_to_binary "$1"`" - if [ -z "$check" ]; then - echo no - exit_success - fi - browser="`read_tde_browser`" - binary="`resolve_tde_browser`" - # Because TDE will use the handler for MIME type text/html if this value - # is empty, we allow either the empty string or a match to $check here. - if [ x"$binary" != x -a x"$binary" != x"$check" ]; then - echo no - exit_success - fi - browser="`get_browser_mime`" - binary="`desktop_file_to_binary "$browser"`" - if [ x"$binary" != x"$check" ]; then - echo no - exit_success - fi - echo yes - exit_success -} - -set_browser_tde() -{ - set_browser_mime "$1" || return - - kwriteconfig --file kdeglobals --group General --key BrowserApplication "$1" - -} - -# }}} TDE - # {{{ GNOME get_browser_gnome() @@ -714,59 +604,6 @@ } # }}} KDE - -# {{{ TDE - -get_url_scheme_handler_tde() -{ - if [ "$1" = "mailto" ]; then - handler="`read_tde_config emaildefaults PROFILE_Default EmailClient | first_word`" - echo "handler is $handler" - if [ x"$handler" != x ]; then - binary_to_desktop_file "$handler" - else - get_browser_mime "x-scheme-handler/$1" - fi - else - get_browser_mime "x-scheme-handler/$1" - fi -} - -check_url_scheme_handler_tde() -{ - check="`desktop_file_to_binary "$2"`" - if [ -z "$check" ]; then - echo no - exit_success - fi - if [ x"$1" = "mailto" ]; then - binary="`read_tde_config emaildefaults PROFILE_Default EmailClient`" - if [ x"$binary" != x"$check" ]; then - echo no - exit_success - fi - fi - handler="`get_browser_mime x-scheme-handler/$1`" - binary="`desktop_file_to_binary "$handler"`" - if [ x"$binary" != x"$check" ]; then - echo no - exit_success - fi - echo yes - exit_success -} - -set_url_scheme_handler_tde() -{ - set_browser_mime "$2" "x-scheme-handler/$1" || return - if [ "$1" = "mailto" ]; then - binary="`desktop_file_to_binary "$2"`" - kwriteconfig --file emaildefaults --group PROFILE_Default --key EmailClient "$binary" - fi -} - -# }}} TDE - # {{{ GNOME get_url_scheme_handler_gnome() @@ -1003,10 +840,6 @@ dispatch_specific kde "$@" ;; - tde) - dispatch_specific tde "$@" - ;; - gnome) dispatch_specific gnome "$@" ;; diff -ur xdg-utils.new/scripts/xdg-utils-common.in xdg-utils.orig/scripts/xdg-utils-common.in --- xdg-utils.new/scripts/xdg-utils-common.in 2017-08-30 05:00:28.000000000 +0200 +++ xdg-utils.orig/scripts/xdg-utils-common.in 2017-08-30 08:33:12.000000000 +0200 @@ -288,9 +288,6 @@ KDE) DE=kde; ;; - Trinity) - DE=tde; - ;; LXDE) DE=lxde; ;;