Launch the browser that is set in the gconf registry.

Don't blindly add "http://" to URL as this will not
    work with local file paths (obviously).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2006-10-28 21:57:24 +00:00
parent 2add9e3c2f
commit 889fda0c95

View File

@ -727,9 +727,13 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
wxUnusedVar(flags);
// set the scheme of url to http if it does not have one
// RR: This doesn't work if the url is just a local path
wxString url(urlOrig);
#if 0
if ( !wxURI(url).HasScheme() )
url.Prepend(wxT("http://"));
#endif
#if defined(__WXMSW__)
@ -842,8 +846,25 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
wxLogDebug(wxT("ICStart error %d"), (int) err);
return false;
}
#elif wxUSE_MIMETYPE
// Non-windows way
#else
// (non-Mac, non-MSW)
#ifdef __UNIX__
if (wxTheApp->GetTraits()->GetDesktopEnvironment() == wxT("GNOME"))
{
wxArrayString errors;
wxArrayString output;
long res = wxExecute( wxT("gconftool-2 --get /desktop/gnome/applications/browser/exec"), output, errors, wxEXEC_NODISABLE );
if (res >= 0 && errors.GetCount() == 0)
{
wxString cmd = output[0];
cmd << _T(' ') << url;
if (wxExecute(cmd))
return true;
}
}
#endif
bool ok = false;
wxString cmd;