diff options
| author | Frederic Crozat <fcrozat@mandriva.com> | 2005-09-19 10:07:25 +0000 |
|---|---|---|
| committer | Frederic Crozat <fcrozat@mandriva.com> | 2005-09-19 10:07:25 +0000 |
| commit | 342c28e20e5ae237fb005269cbeee6e73a1760af (patch) | |
| tree | cea66cb82873efb959addebf20fe2561d44b71ca | |
| parent | 2a8c65a61507811024a722c056b9aa24459db2c9 (diff) | |
| download | common-data-342c28e20e5ae237fb005269cbeee6e73a1760af.tar common-data-342c28e20e5ae237fb005269cbeee6e73a1760af.tar.gz common-data-342c28e20e5ae237fb005269cbeee6e73a1760af.tar.bz2 common-data-342c28e20e5ae237fb005269cbeee6e73a1760af.tar.xz common-data-342c28e20e5ae237fb005269cbeee6e73a1760af.zip | |
Fix previous commit
| -rwxr-xr-x | bin/www-browser | 4 | ||||
| -rw-r--r-- | desktop-common-data.spec | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/bin/www-browser b/bin/www-browser index f34980a..28e4b1a 100755 --- a/bin/www-browser +++ b/bin/www-browser @@ -40,14 +40,12 @@ if [[ -z "$BROWSER" ]]; then if [[ -n "$NEWBROWSER" ]]; then BROWSER=`echo $NEWBROWSER | sed -e 's/BrowserApplication=//' -e 's/!//'` fi - # check for loop BrowserApplication=www-browser - strip_browser_var - [[ -z "$BROWSER" ]] && which kfmclient > /dev/null 2>&1 && BROWSER="kfmclient openProfile webbrowsing" fi strip_browser_var [[ -z "$BROWSER" ]] && BROWSER=`which mozilla-firefox 2> /dev/null` + [[ -z "$BROWSER" ]] && [[ -n "$KDE_FULL_SESSION" ]] && which kfmclient > /dev/null 2>&1 && BROWSER="kfmclient openProfile webbrowsing" [[ -z "$BROWSER" ]] && BROWSER=`which epiphany 2> /dev/null` [[ -z "$BROWSER" ]] && BROWSER=`which galeon 2> /dev/null` [[ -z "$BROWSER" ]] && BROWSER=`which mozilla 2> /dev/null` diff --git a/desktop-common-data.spec b/desktop-common-data.spec index 9ed9fde..deb58bf 100644 --- a/desktop-common-data.spec +++ b/desktop-common-data.spec @@ -172,7 +172,7 @@ rm -fr %buildroot %changelog * Mon Sep 19 2005 Frederic Crozat <fcrozat@mandriva.com> 10.3.1-8mdk -- Fix loop in www-browser (patch from Andrey Borzenkov) +- Fix loop in www-browser (based on patch from Andrey Borzenkov) * Mon Sep 12 2005 Frederic Crozat <fcrozat@mandriva.com> 10.3.1-7mdk - Fix package name and command for gimp in simplified menu (Mdk bug #17627) |