# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1283438778 -3600
# Node ID 67b21c8abcea7c475a4e102d359db0d1d3b6f674
# Parent  2455ef1f5bbcd598fa898d62642db495decdede2# Parent  d1278d87b01e2a4ba19fd2372776f54c6117c4b8
Merge RCL_3 fixes with reverted delivery

diff -r 2455ef1f5bbc -r 67b21c8abcea build/Makefile.project
diff -r 2455ef1f5bbc -r 67b21c8abcea build/buildutils/generatej9zips.py
--- a/build/buildutils/generatej9zips.py	Wed Sep 01 12:33:18 2010 +0100
+++ b/build/buildutils/generatej9zips.py	Thu Sep 02 15:46:18 2010 +0100
@@ -26,7 +26,7 @@
         self.currentDestRoot = None
 
     def convert(self):
-        self.createPackages("weme")
+        # self.createPackages("weme")
         self.createPackages("wece")
         return
 
@@ -325,8 +325,8 @@
           ('winscw/udeb/z/resource/ive/lib/jclFoundation11/locale.zip', 'locale.fp.zip'),
           ('winscw/udeb/z/resource/ive/lib/jclCdc11/locale.zip', 'locale.cdc.zip'),
           ('../../../../../../info.txt', None),
-          ('../../../../copyright.txt', None),
-          ('../../../../../ReleaseNotes-12-10-2009.doc', 'releasenotes/ReleaseNotes.doc')
+          ('../../../../../copyright.txt', None),
+          #('../../../../../ReleaseNotes-12-10-2009.doc', 'releasenotes/ReleaseNotes.doc')
           ]
 
 j9FilesToIgnore = [
diff -r 2455ef1f5bbc -r 67b21c8abcea build/properties.xml
diff -r 2455ef1f5bbc -r 67b21c8abcea inc/java_s60_release.hrh
diff -r 2455ef1f5bbc -r 67b21c8abcea javamanager/javainstaller/installer/build/exports.inf
diff -r 2455ef1f5bbc -r 67b21c8abcea javauis/lcdui_akn/javalcdui/build/javalcdui.pro
--- a/javauis/lcdui_akn/javalcdui/build/javalcdui.pro	Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/lcdui_akn/javalcdui/build/javalcdui.pro	Thu Sep 02 15:46:18 2010 +0100
@@ -48,7 +48,7 @@
         -lws32 \
         -lCentralRepository \ 
 #ifdef RD_JAVA_NGA_ENABLED
-	-llibegl \
+	-llibegl_sw \
 	-llibglesv1_cm
 #endif // RD_JAVA_NGA_ENABLED
 
diff -r 2455ef1f5bbc -r 67b21c8abcea javauis/lcdui_akn/javalcdui/build/javalcdui_0x2002DCBA.mmp
--- a/javauis/lcdui_akn/javalcdui/build/javalcdui_0x2002DCBA.mmp	Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/lcdui_akn/javalcdui/build/javalcdui_0x2002DCBA.mmp	Thu Sep 02 15:46:18 2010 +0100
@@ -157,7 +157,7 @@
 LIBRARY		hwrmlightclient.lib
 LIBRARY		gfxtrans.lib
 LIBRARY		CentralRepository.lib
-LIBRARY		libegl.lib
+LIBRARY		libegl_sw.lib
 LIBRARY		libglesv1_cm.lib
 LIBRARY		javautils.lib
 LIBRARY		libpthread.lib
diff -r 2455ef1f5bbc -r 67b21c8abcea javauis/lcdui_akn/lcdui/build/lcdui.mmp
--- a/javauis/lcdui_akn/lcdui/build/lcdui.mmp	Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/lcdui_akn/lcdui/build/lcdui.mmp	Thu Sep 02 15:46:18 2010 +0100
@@ -208,7 +208,7 @@
 #endif //RD_JAVA_ADVANCED_TACTILE_FEEDBACK
 
 #ifdef RD_JAVA_NGA_ENABLED
-LIBRARY libEGL.lib
+LIBRARY libEGL_sw.lib
 LIBRARY libGLESv1_CM.lib
 LIBRARY alfdecoderserverclient.lib
 LIBRARY	goommonitor.lib
diff -r 2455ef1f5bbc -r 67b21c8abcea javauis/lcdui_akn/lcdui/src/CMIDKeyDecoder.cpp
--- a/javauis/lcdui_akn/lcdui/src/CMIDKeyDecoder.cpp	Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/lcdui_akn/lcdui/src/CMIDKeyDecoder.cpp	Thu Sep 02 15:46:18 2010 +0100
@@ -222,9 +222,12 @@
     TRAP(err, repository = CRepository::NewL(KCRUidMidpLcdui));
     // 2 bytes in scan code
     TBuf8<2> scanCodeBuffer;
-    CleanupStack::PushL(repository);
-    err = repository->Get(KAdditionalSelectKeyMapping,scanCodeBuffer);
-    CleanupStack::PopAndDestroy(repository);
+    if (err == KErrNone)
+    {
+        CleanupStack::PushL(repository);
+        err = repository->Get(KAdditionalSelectKeyMapping,scanCodeBuffer);
+        CleanupStack::PopAndDestroy(repository);
+    }
     if (err == KErrNone)
     {
         TUint8 scanCodeLeft = scanCodeBuffer[0];
diff -r 2455ef1f5bbc -r 67b21c8abcea javauis/m3g_akn/build/javam3g.pro
--- a/javauis/m3g_akn/build/javam3g.pro	Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/m3g_akn/build/javam3g.pro	Thu Sep 02 15:46:18 2010 +0100
@@ -32,7 +32,7 @@
         -lfbscli \
         -ljavalegacyutils \
 #ifdef RD_JAVA_NGA_ENABLED
-        -llibegl \
+        -llibegl_sw \
         -llibglesv1_cm \
 #else        
         -llibGLES_CM \
diff -r 2455ef1f5bbc -r 67b21c8abcea javauis/m3g_akn/build/javam3g_0x2002DCBE.mmp
--- a/javauis/m3g_akn/build/javam3g_0x2002DCBE.mmp	Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/m3g_akn/build/javam3g_0x2002DCBE.mmp	Thu Sep 02 15:46:18 2010 +0100
@@ -75,7 +75,7 @@
 LIBRARY		ezlib.lib
 LIBRARY		fbscli.lib
 LIBRARY		javalegacyutils.lib
-LIBRARY		libegl.lib
+LIBRARY		libegl_sw.lib
 LIBRARY		libglesv1_cm.lib
 LIBRARY		libGLES_CM.lib
 LIBRARY		m3gcore.lib