Enable Firefox support on Windows, and checkpoint Windows Project files.
This commit is contained in:
@@ -40,9 +40,9 @@ namespace Novell.CASA.DataEngines
|
||||
private miCASAEngine micasaengine;
|
||||
#if LINUX
|
||||
private GKEngine gkEngine = null;
|
||||
private KWalletEngine kwEngine = null;
|
||||
private FFEngine ffEngine = null;
|
||||
private KWalletEngine kwEngine = null;
|
||||
#endif
|
||||
private FFEngine ffEngine = null;
|
||||
private AggregationPol aggPol;
|
||||
|
||||
|
||||
@@ -103,8 +103,13 @@ namespace Novell.CASA.DataEngines
|
||||
{
|
||||
string storeID = (((Store)(enumerator.Current)).StoreName);
|
||||
|
||||
if(storeID.Equals(ConstStrings.FF) && (ffEngine==null) )
|
||||
{ //Use the existing instance of firefox
|
||||
//Logger.DbgLog("A-D Lib:FireFox Set up for Aggregation");
|
||||
ffEngine = new FFEngine();
|
||||
}
|
||||
#if LINUX
|
||||
if(storeID.Equals(ConstStrings.KW))
|
||||
else if(storeID.Equals(ConstStrings.KW))
|
||||
{
|
||||
Logger.DbgLog("A-D Lib: KWallet Set up for Aggregation");
|
||||
kwEngine = new KWalletEngine();
|
||||
@@ -114,11 +119,7 @@ namespace Novell.CASA.DataEngines
|
||||
Logger.DbgLog("A-D Lib:Gnome Keyring Set up for Aggregation");
|
||||
gkEngine = new GKEngine();
|
||||
}
|
||||
else if(storeID.Equals(ConstStrings.FF) && (ffEngine==null) )
|
||||
{//Use the existing instance of firefox
|
||||
Logger.DbgLog("A-D Lib:FireFox Set up for Aggregation");
|
||||
ffEngine = new FFEngine();
|
||||
}
|
||||
|
||||
#endif
|
||||
// Console.WriteLine("StoreName = " + ((Store)(enumerator.Current)).StoreName + "StoreId = " + ((Store)(enumerator.Current)).StoreId);
|
||||
}
|
||||
@@ -419,6 +420,38 @@ namespace Novell.CASA.DataEngines
|
||||
else
|
||||
return ConstStrings.CASA_STORE_NOT_AVAILABLE;
|
||||
}
|
||||
else if(StoreID == ConstStrings.CASA_STORE_FFOX)
|
||||
{
|
||||
//Use the existing instance of firefox
|
||||
if(ffEngine == null)
|
||||
ffEngine = new FFEngine();
|
||||
|
||||
if(ffEngine != null)
|
||||
{
|
||||
secEnum = ffEngine.Aggregate();
|
||||
if (secEnum != null )
|
||||
{
|
||||
XmlNode root = outDoc.DocumentElement;
|
||||
XmlNodeList ffNode = root.SelectNodes("descendant::FireFox");
|
||||
if (ffNode.Count != 0) // If there is something remove it
|
||||
{
|
||||
root.RemoveChild(ffNode[0]);
|
||||
}
|
||||
XmlNode ffImportNode = outDoc.ImportNode(secEnum,true);
|
||||
root.AppendChild(ffImportNode);
|
||||
return ConstStrings.CASA_SUCCESS;
|
||||
}
|
||||
else
|
||||
{
|
||||
//Console.WriteLine("FireFox some issue");
|
||||
return ConstStrings.CASA_STORE_NOT_AVAILABLE;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Logger.DbgLog("A-D Lib:Aggregatestore:Could not aggregate Gnome FireFox since FireFoxEngine not instantiated");
|
||||
}
|
||||
}
|
||||
#if LINUX
|
||||
else if( StoreID == ConstStrings.CASA_STORE_GK )
|
||||
{
|
||||
@@ -463,39 +496,6 @@ namespace Novell.CASA.DataEngines
|
||||
}
|
||||
|
||||
}
|
||||
else if(StoreID == ConstStrings.CASA_STORE_FFOX)
|
||||
{
|
||||
//Use the existing instance of firefox
|
||||
if(ffEngine == null)
|
||||
ffEngine = new FFEngine();
|
||||
|
||||
if(ffEngine != null)
|
||||
{
|
||||
secEnum = ffEngine.Aggregate();
|
||||
if (secEnum != null )
|
||||
{
|
||||
XmlNode root = outDoc.DocumentElement;
|
||||
XmlNodeList ffNode = root.SelectNodes("descendant::FireFox");
|
||||
if (ffNode.Count != 0) // If there is something remove it
|
||||
{
|
||||
root.RemoveChild(ffNode[0]);
|
||||
}
|
||||
XmlNode ffImportNode = outDoc.ImportNode(secEnum,true);
|
||||
root.AppendChild(ffImportNode);
|
||||
return ConstStrings.CASA_SUCCESS;
|
||||
}
|
||||
else
|
||||
{
|
||||
//Console.WriteLine("FireFox some issue");
|
||||
return ConstStrings.CASA_STORE_NOT_AVAILABLE;
|
||||
}
|
||||
}
|
||||
else
|
||||
Logger.DbgLog("A-D Lib:Aggregatestore:Could not aggregate Gnome FireFox since FireFoxEngine not instantiated");
|
||||
|
||||
|
||||
}
|
||||
|
||||
Logger.DbgLog("A-D Lib: Unknown Operation Requested");
|
||||
#endif
|
||||
return ConstStrings.CASA_OPERATION_FAILED;
|
||||
|
||||
Reference in New Issue
Block a user