aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/www-browser2
-rw-r--r--desktop-common-data.spec5
2 files changed, 6 insertions, 1 deletions
diff --git a/bin/www-browser b/bin/www-browser
index fb37d0f..f34980a 100755
--- a/bin/www-browser
+++ b/bin/www-browser
@@ -40,6 +40,8 @@ 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
diff --git a/desktop-common-data.spec b/desktop-common-data.spec
index d36a85c..9ed9fde 100644
--- a/desktop-common-data.spec
+++ b/desktop-common-data.spec
@@ -1,7 +1,7 @@
Summary: Desktop common files
Name: desktop-common-data
Version: 10.3.1
-Release: 7mdk
+Release: 8mdk
License: GPL
URL: http://www.mandrivalinux.com/
Group: System/Configuration/Other
@@ -171,6 +171,9 @@ 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)
+
* 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)