Bug 690892 - Replace PR_TRUE/PR_FALSE with true/false on mozilla-central; rs=dbaron
Landing on a CLOSED TREE
This commit is contained in:
@@ -85,10 +85,10 @@ struct MimeTypeAssociation
|
||||
};
|
||||
|
||||
static const ProtocolAssociation appProtocols[] = {
|
||||
{ "http", PR_TRUE },
|
||||
{ "https", PR_TRUE },
|
||||
{ "ftp", PR_FALSE },
|
||||
{ "chrome", PR_FALSE }
|
||||
{ "http", true },
|
||||
{ "https", true },
|
||||
{ "ftp", false },
|
||||
{ "chrome", false }
|
||||
};
|
||||
|
||||
static const MimeTypeAssociation appTypes[] = {
|
||||
@@ -160,25 +160,25 @@ nsGNOMEShellService::GetAppPathFromLauncher()
|
||||
|
||||
const char *launcher = PR_GetEnv("MOZ_APP_LAUNCHER");
|
||||
if (!launcher)
|
||||
return PR_FALSE;
|
||||
return false;
|
||||
|
||||
if (g_path_is_absolute(launcher)) {
|
||||
mAppPath = launcher;
|
||||
tmp = g_path_get_basename(launcher);
|
||||
gchar *fullpath = g_find_program_in_path(tmp);
|
||||
if (fullpath && mAppPath.Equals(fullpath))
|
||||
mAppIsInPath = PR_TRUE;
|
||||
mAppIsInPath = true;
|
||||
g_free(fullpath);
|
||||
} else {
|
||||
tmp = g_find_program_in_path(launcher);
|
||||
if (!tmp)
|
||||
return PR_FALSE;
|
||||
return false;
|
||||
mAppPath = tmp;
|
||||
mAppIsInPath = PR_TRUE;
|
||||
mAppIsInPath = true;
|
||||
}
|
||||
|
||||
g_free(tmp);
|
||||
return PR_TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
@@ -190,7 +190,7 @@ nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
|
||||
gchar *nativePath = g_filename_from_utf8(aKeyValue, -1, NULL, NULL, NULL);
|
||||
if (!nativePath) {
|
||||
NS_ERROR("Error converting path to filesystem encoding");
|
||||
return PR_FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
commandPath = g_find_program_in_path(nativePath);
|
||||
@@ -200,7 +200,7 @@ nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
|
||||
}
|
||||
|
||||
if (!commandPath)
|
||||
return PR_FALSE;
|
||||
return false;
|
||||
|
||||
bool matches = mAppPath.Equals(commandPath);
|
||||
g_free(commandPath);
|
||||
@@ -223,18 +223,18 @@ nsGNOMEShellService::CheckHandlerMatchesAppName(const nsACString &handler) const
|
||||
}
|
||||
|
||||
if (!KeyMatchesAppName(command.get()))
|
||||
return PR_FALSE; // the handler is set to another app
|
||||
return false; // the handler is set to another app
|
||||
|
||||
return PR_TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsGNOMEShellService::IsDefaultBrowser(bool aStartupCheck,
|
||||
bool* aIsDefaultBrowser)
|
||||
{
|
||||
*aIsDefaultBrowser = PR_FALSE;
|
||||
*aIsDefaultBrowser = false;
|
||||
if (aStartupCheck)
|
||||
mCheckedThisSession = PR_TRUE;
|
||||
mCheckedThisSession = true;
|
||||
|
||||
nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
|
||||
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
|
||||
@@ -270,7 +270,7 @@ nsGNOMEShellService::IsDefaultBrowser(bool aStartupCheck,
|
||||
}
|
||||
}
|
||||
|
||||
*aIsDefaultBrowser = PR_TRUE;
|
||||
*aIsDefaultBrowser = true;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -357,7 +357,7 @@ nsGNOMEShellService::GetShouldCheckDefaultBrowser(bool* 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;
|
||||
*aResult = false;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -482,7 +482,7 @@ nsGNOMEShellService::SetDesktopBackground(nsIDOMElement* aElement,
|
||||
nsDependentCString(file_uri));
|
||||
g_free(file_uri);
|
||||
background_settings->SetBoolean(NS_LITERAL_CSTRING(kDesktopDrawBGGSKey),
|
||||
PR_TRUE);
|
||||
true);
|
||||
return rv;
|
||||
}
|
||||
}
|
||||
@@ -500,7 +500,7 @@ nsGNOMEShellService::SetDesktopBackground(nsIDOMElement* aElement,
|
||||
EmptyCString());
|
||||
|
||||
gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey), filePath);
|
||||
gconf->SetBool(NS_LITERAL_CSTRING(kDesktopDrawBGKey), PR_TRUE);
|
||||
gconf->SetBool(NS_LITERAL_CSTRING(kDesktopDrawBGKey), true);
|
||||
}
|
||||
|
||||
return rv;
|
||||
@@ -671,7 +671,7 @@ nsGNOMEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const ns
|
||||
|
||||
const nsCString spec(aURI);
|
||||
const char* specStr = spec.get();
|
||||
return process->Run(PR_FALSE, &specStr, 1);
|
||||
return process->Run(false, &specStr, 1);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
||||
Reference in New Issue
Block a user