browserutilities/webutils/src/CUserAgent.cpp
changeset 36 0ed94ceaa377
parent 13 10e98eab6f85
child 37 cb62a4f66ebe
--- a/browserutilities/webutils/src/CUserAgent.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/webutils/src/CUserAgent.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,12 +21,12 @@
 #include <f32file.h>
 #include <eikenv.h>
 
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 #include "webUtilsCommon.h"
-#include "CUserAgent.h"
+#include "cuseragent.h"
 #include "WebUtilsLogger.h"
 
-#include "WebUtilsInternalCRKeys.h"
+#include "webutilsinternalcrkeys.h"
 
 
 #define KPlaceHolderMozillaVer		_L("Mozilla/5.0")
@@ -692,7 +692,8 @@
     TInt ret(0);
     TBuf<64> BrowserVersionMajor(0);
     TBuf<64> BrowserVersionMinor(0);
-    TBuf<64> BrowserVersionSVNRev(0);
+    TBuf<64> BrowserVersionFeatureRev(0);
+    TBuf<64> BrowserVersionPatchRev(0);
     
 	iBrowserVersionStr = HBufC::NewL(KMaxBrowserVersionStringLength);
 	
@@ -701,21 +702,37 @@
    
     ret = iRepository->Get(KWebUtilsBrowserVersionMajor, BrowserVersionMajor);
     if(ret == KErrNone)
-    	{   
-	    ret = iRepository->Get(KWebUtilsBrowserVersionMinor, BrowserVersionMinor);
-	    if(ret == KErrNone)
-	    	{
-			    ret = iRepository->Get(KWebUtilsBrowserVersionSVNRev, BrowserVersionSVNRev);
-			    if(ret == KErrNone)
-			    {
-			   	BrowserVersionPtr.Append(BrowserVersionMajor);
-    			BrowserVersionPtr.Append(KPlaceHolderPeriod);    
-    	       	BrowserVersionPtr.Append(BrowserVersionMinor);  	
-    			BrowserVersionPtr.Append(KPlaceHolderPeriod);  
-    	    	BrowserVersionPtr.Append(BrowserVersionSVNRev); 	;	   		
-			    }
-	    	}
-	    }
+      {   
+        ret = iRepository->Get(KWebUtilsBrowserVersionMinor, BrowserVersionMinor);
+        if(ret == KErrNone)
+         {
+          ret = iRepository->Get(KWebUtilsBrowserVersionFeatureRev, BrowserVersionFeatureRev);
+          if(ret == KErrNone)
+            {
+             ret = iRepository->Get(KWebUtilsBrowserVersionPatchRev, BrowserVersionPatchRev);
+             if(ret == KErrNone)
+               {
+                BrowserVersionPtr.Append(BrowserVersionMajor);
+                BrowserVersionPtr.Append(KPlaceHolderPeriod);    
+                BrowserVersionPtr.Append(BrowserVersionMinor);  	
+                BrowserVersionPtr.Append(KPlaceHolderPeriod);  
+                BrowserVersionPtr.Append(BrowserVersionFeatureRev);
+                //Incase of Feature releases we do not show Patch number.
+                //Therefore, if the patch version is 0 or empty then we do not show the content
+                if( (BrowserVersionPatchRev.CompareF(_L("0")) == 0)
+                    || (BrowserVersionPatchRev.CompareF(KNullDesC) == 0))
+                 {
+                  //Do Nothing 
+                 }
+                 else
+                 {
+                  BrowserVersionPtr.Append(KPlaceHolderPeriod);  
+                  BrowserVersionPtr.Append(BrowserVersionPatchRev);
+                 }
+                }	   		
+              }
+            }
+           }
 	    
 	if(ret != KErrNone)
 	{