# HG changeset patch
# User hgs
# Date 1286547842 -28800
# Node ID 8cba18227181bcae78bbc5c754a77524d7a1b13e
# Parent  5f6e7f84c9d1701a85910efd4aa078b175742372
201039_2

diff -r 5f6e7f84c9d1 -r 8cba18227181 uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp
--- a/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp	Fri Oct 01 17:27:56 2010 +0800
+++ b/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp	Fri Oct 08 22:24:02 2010 +0800
@@ -120,6 +120,9 @@
 MACRO           WCPLOG
 #endif
 
+#ifdef SYMBIAN_BUILD_GCE
+LIBRARY         goommonitor.lib
+#endif // SYMBIAN_BUILD_GCE
 
 START RESOURCE AknCapServer_reg.rss
 // Do not change the UID below.
diff -r 5f6e7f84c9d1 -r 8cba18227181 uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp
--- a/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp	Fri Oct 01 17:27:56 2010 +0800
+++ b/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp	Fri Oct 08 22:24:02 2010 +0800
@@ -19,7 +19,6 @@
 #include <uikon/eikdefconst.h>
 #include <uikon/eikenvinterface.h>
 #endif
-#include <e32uid.h>
 #include <eikstart.h>
 #include <AknDef.h>
 #include <barsread.h>
@@ -74,6 +73,10 @@
     #include <akntranseffect.h> // for Transition effect enumerations
 #endif
 
+#ifdef SYMBIAN_BUILD_GCE
+    #include <goommonitor.h>
+#endif 
+
 
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 #include <AvkonInternalCRKeys.h>
@@ -228,33 +231,11 @@
     me->iEikSrv.Close(); // currently there is no use to keep this session alive.
 
 #ifdef SYMBIAN_BUILD_GCE
-    const TInt KOOMWatcherDllUid = 0x10282DBF;
-    _LIT(KOOMWatcherDll, "goommonitor.dll");
-
-    RLibrary lib; // we don't need to push to stack because there is no leaving in following operations.
-    TUidType uidType(KDynamicLibraryUid, KSharedLibraryUid, TUid::Uid(KOOMWatcherDllUid));
-
-    err = lib.Load(KOOMWatcherDll, uidType);
-    if (KErrNone == err)
-        {
-        TLibraryFunction func = lib.Lookup(2); /* CreateGOOMWatcherThreadL */
-        if (func)
-            {
-            TRAP(err, (*func)());
-            if (err != KErrNone)
-                {
-                RDebug::Print(_L("Creating out of graphics mem thread in capserver failed with err %d"), err);
-                }
-            }
-        else
-            {
-            RDebug::Print(_L("Lookup function entry in goommonitor.dll return NULL, the entry number may be wrong!"));
-            }
-        }
-    else
-        {
-        RDebug::Print(_L("Dynamically Loading goommonitor.dll failed with err %d, it's ok!"), err);
-        }
+   TRAP( err, CreateGOOMWatcherThreadL());
+   if (err != KErrNone)
+       {
+       RDebug::Print(_L("Creating out of graphics mem thread failed with err %d"), err);
+       }
 #endif 
 
     return err;