Gecko changes that allow us to specify the location of xpcom.dll and hence all the xulrunner binaries (currently hardcoded to c:\Program Files (x86)\Gist\Gist Desktop - TODO fix this)

Author: alansh

common/EmbeddingSetup.cpp

@@ -150,7 +150,8 @@ MozEmbedDirectoryProvider::GetFiles(const char *aKey,
 
 nsresult InitEmbedding(const char* aProfilePath,
                        const nsStaticModuleInfo* aComps,
-                       int aNumComps)
+                       int aNumComps,
+		       const char* aEmbedPath)
 {
     nsresult rv;
 
@@ -174,7 +175,8 @@ nsresult InitEmbedding(const char* aProfilePath,
 
     if (NS_FAILED(rv)) {
         cerr << "Unable to find GRE, try setting GRE_HOME." << endl;
-        return 1;
+        //return 1;
+	xpcomPath = aEmbedPath;
     }
 
     // start the glue, i.e. load and link against xpcom shared lib

common/EmbeddingSetup.h

@@ -61,7 +61,8 @@ typedef PRUint32 nsresult;
  */
 nsresult InitEmbedding(const char* aProfilePath = 0, 
                        const nsStaticModuleInfo* aComps = 0, 
-                       int aNumComps = 0);
+                       int aNumComps = 0,
+                       const char* aEmbedPath = 0);
 
 /**
  * Terminates embedding, i.e. does teardown and unloads needed libs.

common/embed.cpp

@@ -82,9 +82,9 @@ using namespace std;
 // globals
 static nsCOMPtr<WindowCreator> sWindowCreator;
 
-MozApp::MozApp(const char* aProfilePath)
+MozApp::MozApp(const char* aProfilePath, const char* aEmbedPath)
 {
-    InitEmbedding(aProfilePath);
+    InitEmbedding(aProfilePath, 0, 0, aEmbedPath);
 }
 
 MozApp::~MozApp()

common/embed.h

@@ -68,8 +68,10 @@ class MozApp
      *  mozembed of the application dir (where the executable
      *  recides). <b>NOTE:</b> Must be set before any MozView
      *  is created, otherwise the default is used.
+     *  @param aEmbedPath is an optional path to the xpcom.dll
+     *  and is used when we are embedded.
      */
-    MozApp(const char* aProfilePath = 0);
+    MozApp(const char* aProfilePath = 0, const char* aEmbedPath = 0);
 
     /**
      * Destructor.