diff -r 25fce757be94 -r e02eb84a14d2 usbuis/usbuinotif/src/usbuinmain.cpp --- a/usbuis/usbuinotif/src/usbuinmain.cpp Tue Aug 31 16:13:57 2010 +0300 +++ b/usbuis/usbuinotif/src/usbuinmain.cpp Wed Sep 01 12:20:49 2010 +0100 @@ -19,17 +19,22 @@ #include #include #include +#include +#include +#include #include "usbuincableconnectednotifier.h" -#include "usbuinqueriesnotifiermdrv.h" +#include "usbuinqueriesnotifier.h" + + #include "usbuinotifdebug.h" #include "usbuinotifotgwarning.h" #include "usbuinotifotgerror.h" #include "usbuinotifmsmmerror.h" // CONSTANTS -const TInt KUSBUINotifierArrayIncrement = 5; - +const TInt KUSBUINotifierArrayIncrement = 4; +_LIT( KUSBUINotifdll, "usbavkonnotif.dll" ); // ================= EXPORTED FUNCTIONS ======================================= // ---------------------------------------------------------------------------- // @@ -41,12 +46,20 @@ { FLOG(_L("[USBUINOTIF]\t CreateUSBUINotifiersL")); - CUSBUICableConnectedNotifier* cableConnectedNotifier = - CUSBUICableConnectedNotifier::NewL(); - CleanupStack::PushL( cableConnectedNotifier ); - aNotifiers->AppendL( cableConnectedNotifier ); - CleanupStack::Pop( cableConnectedNotifier ); - + /* The CableconnectionNotifier is created on the Avkon Wrapper + * because it contains the discreet popups which are only possible + * to be launched in a UI framework + */ + CAknCommonNotifierWrapper* master = + CAknCommonNotifierWrapper::NewL(KCableConnectedNotifierUid, + KCableConnectedNotifierUid, + MEikSrvNotifierBase2::ENotifierPriorityVHigh, + KUSBUINotifdll, + 1); // no synchronous reply used. + CleanupStack::PushL(master); + + aNotifiers->AppendL(master ); + CleanupStack::Pop( master ); CUSBUIQueriesNotifier* queriesNotifier = CUSBUIQueriesNotifier::NewL(); CleanupStack::PushL( queriesNotifier ); aNotifiers->AppendL( queriesNotifier ); @@ -114,9 +127,9 @@ // ---------------------------------------------------------------------------- const TImplementationProxy ImplementationTable[] = -{ + { IMPLEMENTATION_PROXY_ENTRY( 0x10281F23, NotifierArray ) -}; + }; EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount)