fbpanel (6.1-2) hardcoded-shortcuts.patch

Summary

 exec/make_profile.in |   18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

    
download this patch

Patch contents

Description: Don't set hardcoded apps and use Debian Alternatives system.
Origin: Dererk <dererk@debian.org>
Bug-Debian: http://bugs.debian.org/#585577
Last-Update: <2010-07-05>

Index: fbpanel-6.1/exec/make_profile.in
===================================================================
--- fbpanel-6.1.orig/exec/make_profile.in	2010-07-15 05:21:58.000000000 -0300
+++ fbpanel-6.1/exec/make_profile.in	2010-07-15 05:23:02.000000000 -0300
@@ -46,19 +46,11 @@
 {
     [ -r "$spdir/$1" ] || return 1
 
-    local browser terminal filer
-    for browser in x-www-browser firefox opera; do
-        if which $browser 2> /dev/null > /dev/null; then
-            opt="$opt -e s/x-www-browser/$browser/"
-            break
-        fi
-    done
-    for terminal in x-terminal urxvt gnome-terminal; do
-        if which $terminal 2> /dev/null > /dev/null; then
-            opt="$opt -e s/x-terminal/$terminal/"
-            break
-        fi
-    done
+    # Don't override this and use Debian Alternatives system (See #585577). 
+    opt="$opt -e s/x-www-browser/x-www-browser/"
+    opt="$opt -e s/x-terminal/x-terminal-emulator/"
+
+    local filer
     for filer in x-file-manager thunar pcmanfm rox; do
         if which $filer 2> /dev/null > /dev/null; then
             opt="$opt -e s/x-file-manager/$filer/"