Better but still get a sheet error message.
git-svn-id: svn://10.0.0.236/trunk@120205 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -61,10 +61,12 @@ extern const char *prefContractID;
|
||||
const char *cstr = [mutablePath cString];
|
||||
setenv("MOZILLA_FIVE_HOME", cstr, 1);
|
||||
|
||||
nsresult rv = NS_InitEmbedding(nsnull, nsnull);
|
||||
if (NS_FAILED(rv))
|
||||
return NO;
|
||||
|
||||
nsresult rv;
|
||||
rv = NS_InitEmbedding(nsnull, nsnull);
|
||||
if (NS_FAILED(rv)) {
|
||||
printf("Embedding init failed.\n");
|
||||
return NO;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv));
|
||||
if (NS_FAILED(rv))
|
||||
|
||||
@@ -461,6 +461,7 @@
|
||||
F51B70B5026EC8A601A80166,
|
||||
F541496402714F9A01A80166,
|
||||
F541496502714F9A01A80166,
|
||||
F5DA444B027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXResourcesBuildPhase;
|
||||
name = "Bundle Resources";
|
||||
@@ -2689,6 +2690,24 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DA444A027DD5AA01A80166 = {
|
||||
isa = PBXFileReference;
|
||||
name = "installed-chrome.txt";
|
||||
path = "../dist/Embed/chrome/installed-chrome.txt";
|
||||
refType = 2;
|
||||
};
|
||||
F5DA444B027DD5AA01A80166 = {
|
||||
fileRef = F5DA444A027DD5AA01A80166;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DA444C027DD5AA01A80166 = {
|
||||
fileRef = F5DA444A027DD5AA01A80166;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DAB15002698C0D01A80166 = {
|
||||
isa = PBXFileReference;
|
||||
path = bookmark_on.tif;
|
||||
@@ -2971,18 +2990,6 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F6901D3F01B70DB301A962F7 = {
|
||||
isa = PBXFileReference;
|
||||
name = "installed-chrome.txt";
|
||||
path = "../embedding/config/installed-chrome.txt";
|
||||
refType = 2;
|
||||
};
|
||||
F6901D4001B70DB301A962F7 = {
|
||||
fileRef = F6901D3F01B70DB301A962F7;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F6BA6D4E01B2F8A601A962F7 = {
|
||||
isa = PBXFileReference;
|
||||
path = CHBrowserWrapper.mm;
|
||||
@@ -4780,7 +4787,7 @@
|
||||
F6BD650001B3184301A962F7,
|
||||
F54EF7ED022A2F9C01A80165,
|
||||
F54EF7EE022A2F9C01A80165,
|
||||
F6901D3F01B70DB301A962F7,
|
||||
F5DA444A027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "Gecko Chrome";
|
||||
@@ -4876,7 +4883,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F6BD652401B3184301A962F7,
|
||||
F6901D4001B70DB301A962F7,
|
||||
F5DA444C027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
name = "Copy Files";
|
||||
|
||||
@@ -461,6 +461,7 @@
|
||||
F51B70B5026EC8A601A80166,
|
||||
F541496402714F9A01A80166,
|
||||
F541496502714F9A01A80166,
|
||||
F5DA444B027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXResourcesBuildPhase;
|
||||
name = "Bundle Resources";
|
||||
@@ -2689,6 +2690,24 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DA444A027DD5AA01A80166 = {
|
||||
isa = PBXFileReference;
|
||||
name = "installed-chrome.txt";
|
||||
path = "../dist/Embed/chrome/installed-chrome.txt";
|
||||
refType = 2;
|
||||
};
|
||||
F5DA444B027DD5AA01A80166 = {
|
||||
fileRef = F5DA444A027DD5AA01A80166;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DA444C027DD5AA01A80166 = {
|
||||
fileRef = F5DA444A027DD5AA01A80166;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DAB15002698C0D01A80166 = {
|
||||
isa = PBXFileReference;
|
||||
path = bookmark_on.tif;
|
||||
@@ -2971,18 +2990,6 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F6901D3F01B70DB301A962F7 = {
|
||||
isa = PBXFileReference;
|
||||
name = "installed-chrome.txt";
|
||||
path = "../embedding/config/installed-chrome.txt";
|
||||
refType = 2;
|
||||
};
|
||||
F6901D4001B70DB301A962F7 = {
|
||||
fileRef = F6901D3F01B70DB301A962F7;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F6BA6D4E01B2F8A601A962F7 = {
|
||||
isa = PBXFileReference;
|
||||
path = CHBrowserWrapper.mm;
|
||||
@@ -4780,7 +4787,7 @@
|
||||
F6BD650001B3184301A962F7,
|
||||
F54EF7ED022A2F9C01A80165,
|
||||
F54EF7EE022A2F9C01A80165,
|
||||
F6901D3F01B70DB301A962F7,
|
||||
F5DA444A027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "Gecko Chrome";
|
||||
@@ -4876,7 +4883,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F6BD652401B3184301A962F7,
|
||||
F6901D4001B70DB301A962F7,
|
||||
F5DA444C027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
name = "Copy Files";
|
||||
|
||||
@@ -61,10 +61,12 @@ extern const char *prefContractID;
|
||||
const char *cstr = [mutablePath cString];
|
||||
setenv("MOZILLA_FIVE_HOME", cstr, 1);
|
||||
|
||||
nsresult rv = NS_InitEmbedding(nsnull, nsnull);
|
||||
if (NS_FAILED(rv))
|
||||
return NO;
|
||||
|
||||
nsresult rv;
|
||||
rv = NS_InitEmbedding(nsnull, nsnull);
|
||||
if (NS_FAILED(rv)) {
|
||||
printf("Embedding init failed.\n");
|
||||
return NO;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv));
|
||||
if (NS_FAILED(rv))
|
||||
|
||||
@@ -61,10 +61,12 @@ extern const char *prefContractID;
|
||||
const char *cstr = [mutablePath cString];
|
||||
setenv("MOZILLA_FIVE_HOME", cstr, 1);
|
||||
|
||||
nsresult rv = NS_InitEmbedding(nsnull, nsnull);
|
||||
if (NS_FAILED(rv))
|
||||
return NO;
|
||||
|
||||
nsresult rv;
|
||||
rv = NS_InitEmbedding(nsnull, nsnull);
|
||||
if (NS_FAILED(rv)) {
|
||||
printf("Embedding init failed.\n");
|
||||
return NO;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv));
|
||||
if (NS_FAILED(rv))
|
||||
|
||||
@@ -461,6 +461,7 @@
|
||||
F51B70B5026EC8A601A80166,
|
||||
F541496402714F9A01A80166,
|
||||
F541496502714F9A01A80166,
|
||||
F5DA444B027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXResourcesBuildPhase;
|
||||
name = "Bundle Resources";
|
||||
@@ -2689,6 +2690,24 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DA444A027DD5AA01A80166 = {
|
||||
isa = PBXFileReference;
|
||||
name = "installed-chrome.txt";
|
||||
path = "../dist/Embed/chrome/installed-chrome.txt";
|
||||
refType = 2;
|
||||
};
|
||||
F5DA444B027DD5AA01A80166 = {
|
||||
fileRef = F5DA444A027DD5AA01A80166;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DA444C027DD5AA01A80166 = {
|
||||
fileRef = F5DA444A027DD5AA01A80166;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DAB15002698C0D01A80166 = {
|
||||
isa = PBXFileReference;
|
||||
path = bookmark_on.tif;
|
||||
@@ -2971,18 +2990,6 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F6901D3F01B70DB301A962F7 = {
|
||||
isa = PBXFileReference;
|
||||
name = "installed-chrome.txt";
|
||||
path = "../embedding/config/installed-chrome.txt";
|
||||
refType = 2;
|
||||
};
|
||||
F6901D4001B70DB301A962F7 = {
|
||||
fileRef = F6901D3F01B70DB301A962F7;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F6BA6D4E01B2F8A601A962F7 = {
|
||||
isa = PBXFileReference;
|
||||
path = CHBrowserWrapper.mm;
|
||||
@@ -4780,7 +4787,7 @@
|
||||
F6BD650001B3184301A962F7,
|
||||
F54EF7ED022A2F9C01A80165,
|
||||
F54EF7EE022A2F9C01A80165,
|
||||
F6901D3F01B70DB301A962F7,
|
||||
F5DA444A027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "Gecko Chrome";
|
||||
@@ -4876,7 +4883,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F6BD652401B3184301A962F7,
|
||||
F6901D4001B70DB301A962F7,
|
||||
F5DA444C027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
name = "Copy Files";
|
||||
|
||||
@@ -461,6 +461,7 @@
|
||||
F51B70B5026EC8A601A80166,
|
||||
F541496402714F9A01A80166,
|
||||
F541496502714F9A01A80166,
|
||||
F5DA444B027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXResourcesBuildPhase;
|
||||
name = "Bundle Resources";
|
||||
@@ -2689,6 +2690,24 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DA444A027DD5AA01A80166 = {
|
||||
isa = PBXFileReference;
|
||||
name = "installed-chrome.txt";
|
||||
path = "../dist/Embed/chrome/installed-chrome.txt";
|
||||
refType = 2;
|
||||
};
|
||||
F5DA444B027DD5AA01A80166 = {
|
||||
fileRef = F5DA444A027DD5AA01A80166;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DA444C027DD5AA01A80166 = {
|
||||
fileRef = F5DA444A027DD5AA01A80166;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F5DAB15002698C0D01A80166 = {
|
||||
isa = PBXFileReference;
|
||||
path = bookmark_on.tif;
|
||||
@@ -2971,18 +2990,6 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F6901D3F01B70DB301A962F7 = {
|
||||
isa = PBXFileReference;
|
||||
name = "installed-chrome.txt";
|
||||
path = "../embedding/config/installed-chrome.txt";
|
||||
refType = 2;
|
||||
};
|
||||
F6901D4001B70DB301A962F7 = {
|
||||
fileRef = F6901D3F01B70DB301A962F7;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F6BA6D4E01B2F8A601A962F7 = {
|
||||
isa = PBXFileReference;
|
||||
path = CHBrowserWrapper.mm;
|
||||
@@ -4780,7 +4787,7 @@
|
||||
F6BD650001B3184301A962F7,
|
||||
F54EF7ED022A2F9C01A80165,
|
||||
F54EF7EE022A2F9C01A80165,
|
||||
F6901D3F01B70DB301A962F7,
|
||||
F5DA444A027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "Gecko Chrome";
|
||||
@@ -4876,7 +4883,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F6BD652401B3184301A962F7,
|
||||
F6901D4001B70DB301A962F7,
|
||||
F5DA444C027DD5AA01A80166,
|
||||
);
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
name = "Copy Files";
|
||||
|
||||
@@ -61,10 +61,12 @@ extern const char *prefContractID;
|
||||
const char *cstr = [mutablePath cString];
|
||||
setenv("MOZILLA_FIVE_HOME", cstr, 1);
|
||||
|
||||
nsresult rv = NS_InitEmbedding(nsnull, nsnull);
|
||||
if (NS_FAILED(rv))
|
||||
return NO;
|
||||
|
||||
nsresult rv;
|
||||
rv = NS_InitEmbedding(nsnull, nsnull);
|
||||
if (NS_FAILED(rv)) {
|
||||
printf("Embedding init failed.\n");
|
||||
return NO;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv));
|
||||
if (NS_FAILED(rv))
|
||||
|
||||
Reference in New Issue
Block a user