--- a/usbuis/usbuinotif/src/usbuinmain.cpp Tue Feb 02 00:52:37 2010 +0200
+++ b/usbuis/usbuinotif/src/usbuinmain.cpp Fri Mar 19 09:48:52 2010 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -20,21 +20,17 @@
#include <ecom/implementationproxy.h>
#include <eiknotapi.h>
#include <eikenv.h>
-#include <AknNotifierWrapper.h>
-#include <usbuinotif.h>
#include "usbuincableconnectednotifier.h"
#include "usbuinqueriesnotifier.h"
-
-
#include "usbuinotifdebug.h"
#include "usbuinotifotgwarning.h"
#include "usbuinotifotgerror.h"
#include "usbuinotifmsmmerror.h"
// CONSTANTS
-const TInt KUSBUINotifierArrayIncrement = 4;
-_LIT( KUSBUINotifdll, "usbavkonnotif.dll" );
+const TInt KUSBUINotifierArrayIncrement = 5;
+
// ================= EXPORTED FUNCTIONS =======================================
// ----------------------------------------------------------------------------
//
@@ -46,20 +42,12 @@
{
FLOG(_L("[USBUINOTIF]\t CreateUSBUINotifiersL"));
- /* 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 );
+ CUSBUICableConnectedNotifier* cableConnectedNotifier =
+ CUSBUICableConnectedNotifier::NewL();
+ CleanupStack::PushL( cableConnectedNotifier );
+ aNotifiers->AppendL( cableConnectedNotifier );
+ CleanupStack::Pop( cableConnectedNotifier );
+
CUSBUIQueriesNotifier* queriesNotifier = CUSBUIQueriesNotifier::NewL();
CleanupStack::PushL( queriesNotifier );
aNotifiers->AppendL( queriesNotifier );
@@ -128,11 +116,7 @@
const TImplementationProxy ImplementationTable[] =
{
-#ifdef __EABI__
- {{0x10281F23},(TFuncPtr)NotifierArray},
-#else
- {{0x10281F23},NotifierArray},
-#endif
+ IMPLEMENTATION_PROXY_ENTRY( 0x10281F23, NotifierArray )
};
EXPORT_C const TImplementationProxy* ImplementationGroupProxy(