# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1271250929 -10800
# Node ID f392bfb21e08bb149df2e01b0a9b987352cb3ba9
# Parent  bdac6c4623926c8eb0798fcb2bba088ceb7030e3
Revision: 201013
Kit: 201015

diff -r bdac6c462392 -r f392bfb21e08 gssettingsuis/Gs/GSCallBarringPlugin/Inc/GSCallBarringPlugin.h
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Inc/GSCallBarringPlugin.h	Wed Mar 31 22:01:53 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Inc/GSCallBarringPlugin.h	Wed Apr 14 16:15:29 2010 +0300
@@ -120,6 +120,13 @@
         */
         TBool Visible() const;
 
+        /**
+        * @see CGSPluginInterface header file.
+        */        
+        TGSListboxItemTypes ItemType();
+        
+        void HandleSelection(
+                    const TGSSelectionTypes aSelectionType );
     public: //new
         
         /**
diff -r bdac6c462392 -r f392bfb21e08 gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCallBarringPlugin.cpp
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCallBarringPlugin.cpp	Wed Mar 31 22:01:53 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCallBarringPlugin.cpp	Wed Apr 14 16:15:29 2010 +0300
@@ -527,4 +527,17 @@
     return iVoipSupported;
     }
 
+TGSListboxItemTypes CGSCallBarringPlugin::ItemType()
+    {
+    __GSLOGSTRING1( "[CGSCallBarringPlugin::ItemType] type %d", EGSItemTypeSettingDialog );
+    return EGSItemTypeSettingDialog;
+    }
+
+void CGSCallBarringPlugin::HandleSelection(
+                const TGSSelectionTypes /*aSelectionType*/ )
+    {
+    __GSLOGSTRING( "[CGSCallBarringPlugin::HandleSelection] Start" );
+    ActivateInternalViewL();
+    __GSLOGSTRING( "[CGSCallBarringPlugin::HandleSelection] End" );
+    }
  // End of file
diff -r bdac6c462392 -r f392bfb21e08 gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPlugin.cpp
--- a/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPlugin.cpp	Wed Mar 31 22:01:53 2010 +0300
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPlugin.cpp	Wed Apr 14 16:15:29 2010 +0300
@@ -714,6 +714,7 @@
                     }
                 else if ( current == KGSWNImageIndex )
                     {
+                    aSettingPage->MakeVisible(EFalse); 
                     ShowWelcomeNoteImageListL();
                     }
                 break;
diff -r bdac6c462392 -r f392bfb21e08 profilesservices/MediaFileList/Src/mediafiledialog.cpp
--- a/profilesservices/MediaFileList/Src/mediafiledialog.cpp	Wed Mar 31 22:01:53 2010 +0300
+++ b/profilesservices/MediaFileList/Src/mediafiledialog.cpp	Wed Apr 14 16:15:29 2010 +0300
@@ -1605,7 +1605,8 @@
         iMediaFileHandler->QueryEmptyL();
         }
     
-    if ( !iMediaFileHandler->QueryReady() )
+    if ( !iMediaFileHandler->QueryReady() 
+	        && aFolderId != EEFolderRoot && aFolderId != EEFolderMusic )
         {
         // query is running - show wait note with delay. wait note is
         // removed in HandleMFEventL
diff -r bdac6c462392 -r f392bfb21e08 profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp
--- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp	Wed Mar 31 22:01:53 2010 +0300
+++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp	Wed Apr 14 16:15:29 2010 +0300
@@ -28,7 +28,7 @@
 #include    <barsc.h>
 #include    <bautils.h>
 
-#include	<SeconDarydisplay/SecondaryDisplayProfilesAPI.h>
+#include	<SecondaryDisplay/SecondaryDisplayProfilesAPI.h>
 #include	<aknSDData.h>
 #include	<featmgr.h>