pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Added a missing "Classes" unit in the uses clause.

Browse Source 
Added parsing of environment "MOZILLA_FIVE_HOME" under Windows.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1421 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
Joshy
2011-01-02 23:03:07 +00:00
parent 3859aeffbc
commit 3327a1bf59
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/geckoport/nsXRE.pas
View File

@ -3,7 +3,7 @@ unit nsXRE;
interface
uses
nsTypes, nsXPCOM, nsInit;
Classes, nsTypes, nsXPCOM, nsInit;
type
PXREAppData = ^nsXREAppData;
@ -171,6 +171,7 @@ var
vers: TGREVersionRange;
xpcomPath: array[0..MAX_PATH] of AnsiChar;
lastSlash: PAnsiChar;
MOZILLAFIVEHOME: string;
{$IFDEF LINUX}
EachPath: string;
LDPATH: string;
@ -199,8 +200,10 @@ begin
Exit;
*)
//Changed checking order. Preference is xulrunner in application folder
if ParamStr(1)<>'' then begin
NS_StrLCopy(xpcomPath, PChar(ParamStr(1) + '\xpcom.dll'), MAX_PATH);
MOZILLAFIVEHOME:=GetEnvironmentVariable('MOZILLA_FIVE_HOME');
if MOZILLAFIVEHOME<>'' then begin
if MOZILLAFIVEHOME[Length(MOZILLAFIVEHOME)]<>PathDelim then MOZILLAFIVEHOME:=MOZILLAFIVEHOME+PathDelim;
NS_StrLCopy(xpcomPath, PChar(MOZILLAFIVEHOME+'xpcom.dll'), MAX_PATH);
Result:=NS_OK;
end else begin
NS_StrLCopy(xpcomPath, PChar(ExtractFilePath(ParamStr(0)) + 'xpcom.dll'), MAX_PATH);