diff --git a/camino/CHPreferenceManager.mm b/camino/CHPreferenceManager.mm index 2af006e97e1..a69d6b22aa0 100644 --- a/camino/CHPreferenceManager.mm +++ b/camino/CHPreferenceManager.mm @@ -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 profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv)); if (NS_FAILED(rv)) diff --git a/camino/Chimera.pbproj/project.pbxproj b/camino/Chimera.pbproj/project.pbxproj index a256f3b26cb..f35be803738 100644 --- a/camino/Chimera.pbproj/project.pbxproj +++ b/camino/Chimera.pbproj/project.pbxproj @@ -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"; diff --git a/camino/projects/Chimera.pbproj/project.pbxproj b/camino/projects/Chimera.pbproj/project.pbxproj index a256f3b26cb..f35be803738 100644 --- a/camino/projects/Chimera.pbproj/project.pbxproj +++ b/camino/projects/Chimera.pbproj/project.pbxproj @@ -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"; diff --git a/camino/src/preferences/PreferenceManager.mm b/camino/src/preferences/PreferenceManager.mm index 2af006e97e1..a69d6b22aa0 100644 --- a/camino/src/preferences/PreferenceManager.mm +++ b/camino/src/preferences/PreferenceManager.mm @@ -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 profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv)); if (NS_FAILED(rv)) diff --git a/chimera/CHPreferenceManager.mm b/chimera/CHPreferenceManager.mm index 2af006e97e1..a69d6b22aa0 100644 --- a/chimera/CHPreferenceManager.mm +++ b/chimera/CHPreferenceManager.mm @@ -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 profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv)); if (NS_FAILED(rv)) diff --git a/chimera/Chimera.pbproj/project.pbxproj b/chimera/Chimera.pbproj/project.pbxproj index a256f3b26cb..f35be803738 100644 --- a/chimera/Chimera.pbproj/project.pbxproj +++ b/chimera/Chimera.pbproj/project.pbxproj @@ -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"; diff --git a/chimera/projects/Chimera.pbproj/project.pbxproj b/chimera/projects/Chimera.pbproj/project.pbxproj index a256f3b26cb..f35be803738 100644 --- a/chimera/projects/Chimera.pbproj/project.pbxproj +++ b/chimera/projects/Chimera.pbproj/project.pbxproj @@ -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"; diff --git a/chimera/src/preferences/PreferenceManager.mm b/chimera/src/preferences/PreferenceManager.mm index 2af006e97e1..a69d6b22aa0 100644 --- a/chimera/src/preferences/PreferenceManager.mm +++ b/chimera/src/preferences/PreferenceManager.mm @@ -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 profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv)); if (NS_FAILED(rv))