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

Back out everything since 5435ee09cf7b. Tinderbox compilers hate me. r=epic-fail

Browse Source
This commit is contained in:
Jeff Walden
2011-10-12 12:21:53 -07:00
parent 5de74dc5b1
commit c5e5f873d1
311 changed files with 1334 additions and 2251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,8 +34,6 @@
*
* ***** END LICENSE BLOCK ***** */
#include "mozilla/Util.h"
#include "nsCOMPtr.h"
#include "nsGNOMEShellService.h"
#include "nsShellService.h"
@@ -70,8 +68,6 @@
#include <limits.h>
#include <stdlib.h>
using namespace mozilla;
struct ProtocolAssociation
{
const char *name;
@@ -243,7 +239,7 @@ nsGNOMEShellService::IsDefaultBrowser(bool aStartupCheck,
nsCAutoString handler;
nsCOMPtr<nsIGIOMimeApp> gioApp;
for (unsigned int i = 0; i < ArrayLength(appProtocols); ++i) {
for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
if (!appProtocols[i].essential)
continue;
@@ -299,7 +295,7 @@ nsGNOMEShellService::SetDefaultBrowser(bool aClaimAllTypes,
appKeyValue.AppendLiteral(" %s");
for (unsigned int i = 0; i < ArrayLength(appProtocols); ++i) {
for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
if (appProtocols[i].essential || aClaimAllTypes) {
gconf->SetAppForProtocol(nsDependentCString(appProtocols[i].name),
appKeyValue);
@@ -332,7 +328,7 @@ nsGNOMEShellService::SetDefaultBrowser(bool aClaimAllTypes,
NS_ENSURE_SUCCESS(rv, rv);
// set handler for the protocols
for (unsigned int i = 0; i < ArrayLength(appProtocols); ++i) {
for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
if (appProtocols[i].essential || aClaimAllTypes) {
appInfo->SetAsDefaultForURIScheme(nsDependentCString(appProtocols[i].name));
}
@@ -341,7 +337,7 @@ nsGNOMEShellService::SetDefaultBrowser(bool aClaimAllTypes,
// set handler for .html and xhtml files and MIME types:
if (aClaimAllTypes) {
// Add mime types for html, xhtml extension and set app to just created appinfo.
for (unsigned int i = 0; i < ArrayLength(appTypes); ++i) {
for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appTypes); ++i) {
appInfo->SetAsDefaultForMimeType(nsDependentCString(appTypes[i].mimeType));
appInfo->SetAsDefaultForFileExtensions(nsDependentCString(appTypes[i].extensions));
}