--- a/uiacceltk/hitchcock/ServerCore/Src/alfappsrvsessionBase.cpp	Tue May 25 13:39:57 2010 +0300
+++ b/uiacceltk/hitchcock/ServerCore/Src/alfappsrvsessionBase.cpp	Wed Jun 09 10:41:25 2010 +0300
@@ -36,6 +36,8 @@
 #include "alf/alfextensionfactory.h"
 #include "alf/alfversion.h"
 #include "alfsrvsettingshandler.h"
+#include "alfstreamerconsts.h"
+#include "alfdecoderserverclient.h"
 
 const TUint KAlfMaxCpuUsageDuringPointerEvent = 35; // Percentage
 
@@ -106,6 +108,7 @@
     RMessagePtr2 iSystemEvent;
     TInt iParentId;
     TBool iActive;
+    TUint iSecureId;
     }; 
 
 // ======== MEMBER FUNCTIONS ========
@@ -129,11 +132,17 @@
 // ---------------------------------------------------------------------------
 //
 EXPORT_C CAlfAppSrvSessionBase::~CAlfAppSrvSessionBase()
-    { 
+    {
+        
     iHost->HandleClientExit(reinterpret_cast<TInt>(this));
     
     if ( iData )
         {
+        if (AlfAppUi()->BridgerClient())
+            {
+            AlfAppUi()->BridgerClient()->SendBlind(EAlfExcludeFromGoomTargets, TIpcArgs(iData->iSecureId,iData->iClientWindowGroupId));
+            }
+            
         iData->iHandles.Close();
         delete iData->iObjectIx;
     
@@ -208,6 +217,7 @@
 //
 EXPORT_C void CAlfAppSrvSessionBase::ServiceL(const RMessage2& aMessage)
     {
+    iData->iSecureId = aMessage.SecureId(); // one time would be enough    
     if(iHost->MetricsInterface())
         {
         iHost->MetricsInterface()->EnterClientMessageL(reinterpret_cast<TInt>(this), aMessage);
@@ -396,6 +406,10 @@
     {
     __ASSERT_DEBUG(iData, USER_INVARIANT());
     iData->iClientWindowGroupId = aId;
+    if (AlfAppUi()->BridgerClient())
+        {
+        AlfAppUi()->BridgerClient()->SendBlind(EAlfVolunteerForGoomTarget, TIpcArgs(iData->iSecureId, iData->iClientWindowGroupId));
+        }
     }
 
 // ---------------------------------------------------------------------------