Bug 773151: Convert nsCAutoString->nsAutoCString CLOSED TREE r=bsmedberg
This commit is contained in:
@@ -179,7 +179,7 @@ nsGNOMEShellService::CheckHandlerMatchesAppName(const nsACString &handler) const
|
||||
{
|
||||
gint argc;
|
||||
gchar **argv;
|
||||
nsCAutoString command(handler);
|
||||
nsAutoCString command(handler);
|
||||
|
||||
// The string will be something of the form: [/path/to/]browser "%s"
|
||||
// We want to remove all of the parameters and get just the binary name.
|
||||
@@ -207,7 +207,7 @@ nsGNOMEShellService::IsDefaultBrowser(bool aStartupCheck,
|
||||
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
|
||||
|
||||
bool enabled;
|
||||
nsCAutoString handler;
|
||||
nsAutoCString handler;
|
||||
nsCOMPtr<nsIGIOMimeApp> gioApp;
|
||||
|
||||
for (unsigned int i = 0; i < ArrayLength(appProtocols); ++i) {
|
||||
@@ -254,7 +254,7 @@ nsGNOMEShellService::SetDefaultBrowser(bool aClaimAllTypes,
|
||||
nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
|
||||
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
|
||||
if (gconf) {
|
||||
nsCAutoString appKeyValue;
|
||||
nsAutoCString appKeyValue;
|
||||
if (mAppIsInPath) {
|
||||
// mAppPath is in the users path, so use only the basename as the launcher
|
||||
gchar *tmp = g_path_get_basename(mAppPath.get());
|
||||
@@ -406,7 +406,7 @@ nsGNOMEShellService::SetDesktopBackground(nsIDOMElement* aElement,
|
||||
if (!container) return rv;
|
||||
|
||||
// Set desktop wallpaper filling style
|
||||
nsCAutoString options;
|
||||
nsAutoCString options;
|
||||
if (aPosition == BACKGROUND_TILE)
|
||||
options.Assign("wallpaper");
|
||||
else if (aPosition == BACKGROUND_STRETCH)
|
||||
@@ -419,7 +419,7 @@ nsGNOMEShellService::SetDesktopBackground(nsIDOMElement* aElement,
|
||||
options.Assign("centered");
|
||||
|
||||
// Write the background file to the home directory.
|
||||
nsCAutoString filePath(PR_GetEnv("HOME"));
|
||||
nsAutoCString filePath(PR_GetEnv("HOME"));
|
||||
|
||||
// get the product brand name from localized strings
|
||||
nsString brandName;
|
||||
@@ -499,7 +499,7 @@ nsGNOMEShellService::GetDesktopBackgroundColor(uint32_t *aColor)
|
||||
nsCOMPtr<nsIGSettingsService> gsettings =
|
||||
do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
||||
nsCOMPtr<nsIGSettingsCollection> background_settings;
|
||||
nsCAutoString background;
|
||||
nsAutoCString background;
|
||||
|
||||
if (gsettings) {
|
||||
gsettings->GetCollectionForSchema(
|
||||
@@ -551,7 +551,7 @@ NS_IMETHODIMP
|
||||
nsGNOMEShellService::SetDesktopBackgroundColor(uint32_t aColor)
|
||||
{
|
||||
NS_ASSERTION(aColor <= 0xffffff, "aColor has extra bits");
|
||||
nsCAutoString colorString;
|
||||
nsAutoCString colorString;
|
||||
ColorToCString(aColor, colorString);
|
||||
|
||||
nsCOMPtr<nsIGSettingsService> gsettings =
|
||||
@@ -579,7 +579,7 @@ nsGNOMEShellService::SetDesktopBackgroundColor(uint32_t aColor)
|
||||
NS_IMETHODIMP
|
||||
nsGNOMEShellService::OpenApplication(int32_t aApplication)
|
||||
{
|
||||
nsCAutoString scheme;
|
||||
nsAutoCString scheme;
|
||||
if (aApplication == APPLICATION_MAIL)
|
||||
scheme.Assign("mailto");
|
||||
else if (aApplication == APPLICATION_NEWS)
|
||||
@@ -600,7 +600,7 @@ nsGNOMEShellService::OpenApplication(int32_t aApplication)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
bool enabled;
|
||||
nsCAutoString appCommand;
|
||||
nsAutoCString appCommand;
|
||||
gconf->GetAppForProtocol(scheme, &enabled, appCommand);
|
||||
|
||||
if (!enabled)
|
||||
|
||||
Reference in New Issue
Block a user