corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out bug 311605 pending further testing.

Browse Source
This commit is contained in:
gavin@gavinsharp.com
2005-12-04 21:02:38 +00:00
parent 5ccb47fccf
commit 1e0aa697b0
12 changed files with 223 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
browser/components/shell/src/nsGNOMEShellService.cpp
View File

@@ -164,9 +164,12 @@ nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
}
NS_IMETHODIMP
nsGNOMEShellService::IsDefaultBrowser(PRBool* aIsDefaultBrowser)
nsGNOMEShellService::IsDefaultBrowser(PRBool aStartupCheck,
PRBool* aIsDefaultBrowser)
{
*aIsDefaultBrowser = PR_FALSE;
if (aStartupCheck)
mCheckedThisSession = PR_TRUE;
nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
@@ -307,6 +310,39 @@ nsGNOMEShellService::SetDefaultBrowser(PRBool aClaimAllTypes,
return NS_OK;
}
NS_IMETHODIMP
nsGNOMEShellService::GetShouldCheckDefaultBrowser(PRBool* aResult)
{
// If we've already checked, the browser has been started and this is a
// new window open, and we don't want to check again.
if (mCheckedThisSession) {
*aResult = PR_FALSE;
return NS_OK;
}
nsCOMPtr<nsIPrefBranch> prefs;
nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (pserve)
pserve->GetBranch("", getter_AddRefs(prefs));
prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult);
return NS_OK;
}
NS_IMETHODIMP
nsGNOMEShellService::SetShouldCheckDefaultBrowser(PRBool aShouldCheck)
{
nsCOMPtr<nsIPrefBranch> prefs;
nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (pserve)
pserve->GetBranch("", getter_AddRefs(prefs));
prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck);
return NS_OK;
}
static nsresult
WriteImage(const nsCString& aPath, gfxIImageFrame* aImage)
{