--- a/usbclasses/usbphoneasmodem/classimplementation/mscfileserver/src/filesystemimage.cpp	Fri Jul 23 13:40:58 2010 +0300
+++ b/usbclasses/usbphoneasmodem/classimplementation/mscfileserver/src/filesystemimage.cpp	Mon Aug 09 09:08:10 2010 +0300
@@ -88,7 +88,7 @@
 
 TInt64 CFileSystemImage::Size()
 	{
-	TInt size;
+	TInt size = 0;
 	iFile.Size( size );
 	return size;
 	}

--- a/usbengines/usbotgwatcher/src/cusbotgwatcher.cpp	Fri Jul 23 13:40:58 2010 +0300
+++ b/usbengines/usbotgwatcher/src/cusbotgwatcher.cpp	Mon Aug 09 09:08:10 2010 +0300
@@ -898,7 +898,7 @@
 
     iUsbServiceRequest = CUsbServiceControl::ERequestUndefined;
 
-    TUsbServiceState serviceState;
+    TUsbServiceState serviceState = EUsbServiceIdle;
     TInt err = iUsb.GetServiceState(serviceState);
 
     if (KErrNone != err)

--- a/usbengines/usbotgwatcher/src/cusbservicecontrol.cpp	Fri Jul 23 13:40:58 2010 +0300
+++ b/usbengines/usbotgwatcher/src/cusbservicecontrol.cpp	Mon Aug 09 09:08:10 2010 +0300
@@ -80,7 +80,7 @@
 
     LOG1( "aPersonalityId = %d" , aPersonalityId);
 
-    TUsbServiceState serviceState;
+    TUsbServiceState serviceState = EUsbServiceIdle;
     TInt err = iUsb.GetServiceState(serviceState);
 
     if (KErrNone != err)
@@ -182,7 +182,7 @@
     {
     LOG_FUNC
 
-    TUsbServiceState serviceState;
+    TUsbServiceState serviceState = EUsbServiceIdle;
     TInt err = iUsb.GetServiceState(serviceState);
 
     LOG2("err = %d; serviceState = %d" , err, serviceState);
@@ -270,7 +270,7 @@
         return;
         }
 
-    TUsbServiceState serviceState;
+    TUsbServiceState serviceState = EUsbServiceIdle;
     TInt err = iUsb.GetServiceState(serviceState);
 
     if (KErrNone != err)

--- a/usbengines/usbwatcher/src/cusbactivepersonalityhandler.cpp	Fri Jul 23 13:40:58 2010 +0300
+++ b/usbengines/usbwatcher/src/cusbactivepersonalityhandler.cpp	Mon Aug 09 09:08:10 2010 +0300
@@ -270,7 +270,8 @@
         {
         case EUsbDeviceStateConfigured:
             {
-            if( aStateOld != EUsbDeviceStateSuspended ) 
+            if ((aStateOld != EUsbDeviceStateSuspended) && (ESwStateCharging
+                    != CUsbGlobalSystemStateObserver::GlobalSystemState()))
                 {
                 iPersonalityParams->PersonalityNotifier().ShowQuery(
                         KCableConnectedNotifierUid, iDummy,
@@ -315,9 +316,13 @@
     	                iQueryParams, iDummyBuf);
             break;
         case KErrDiskFull:
-            iQueryParams().iQuery = EUSBDiskFull;
-            iPersonalityParams->PersonalityNotifier().ShowQuery(KQueriesNotifier, 
-    	                iQueryParams, iDummyBuf);
+            if (ESwStateCharging
+                    != CUsbGlobalSystemStateObserver::GlobalSystemState())
+                {
+                iQueryParams().iQuery = EUSBDiskFull;
+                iPersonalityParams->PersonalityNotifier().ShowQuery(
+                        KQueriesNotifier, iQueryParams, iDummyBuf);
+                }
             break;
         default:
         	LOG( "Ignored" );

--- a/usbuis/imageprintui/src/notes.cpp	Fri Jul 23 13:40:58 2010 +0300
+++ b/usbuis/imageprintui/src/notes.cpp	Mon Aug 09 09:08:10 2010 +0300
@@ -192,7 +192,6 @@
     FLOG(_L("[IMAGEPRINTUI]<<< CNotes::PrepareShowProgressNoteL; PrepareLC next"));	
    	iProgressDialog->PrepareLC(R_PROGRESS_NOTE);
 	CEikProgressInfo* progressBar = iProgressDialog->GetProgressInfoL(); // not taking ownership
-	progressBar = iProgressDialog->GetProgressInfoL();
 	FLOG(_L("[IMAGEPRINTUI]<<< CNotes::PrepareShowProgressNoteL; progressinfo got"));	
 	
     progressBar->SetFinalValue( KProgressFinishValue );

--- a/usbuis/usbindicatorplugin/src/usbmassstorageindicator.cpp	Fri Jul 23 13:40:58 2010 +0300
+++ b/usbuis/usbindicatorplugin/src/usbmassstorageindicator.cpp	Mon Aug 09 09:08:10 2010 +0300
@@ -64,11 +64,7 @@
             myDebug() << "    UsbMassStorageIndicator::handleInteraction hostMassStorage connected";
             if (err == KErrNone) {
                 hostMassStorage.EjectUsbDrives();
-                myDebug() << ">>> UsbMassStorageIndicator::handleInteraction EjectUsbDrives called";
-                if (err != KErrNone) {
-                    myDebug() << "    UsbMassStorageIndicator::handleInteraction "
-                            <<"RHostMassStorage EjectUsbDrives fail " << err;
-                }
+                myDebug() << "UsbMassStorageIndicator::handleInteraction EjectUsbDrives called";
             }
             else {
                 myDebug() << "    UsbMassStorageIndicator::handleInteraction "

--- a/usbuis/usbsettingsapp/src/usbsettingsapp.cpp	Fri Jul 23 13:40:58 2010 +0300
+++ b/usbuis/usbsettingsapp/src/usbsettingsapp.cpp	Mon Aug 09 09:08:10 2010 +0300
@@ -76,6 +76,7 @@
         if (listViewWidget) {
             myDebug() << "    USBSettingsApp::load listView found";
             HbListView *listView = qobject_cast<HbListView*>(listViewWidget);
+            listView->setItemPixmapCacheEnabled(true);
             listView->setModel(mModel);
             listView->setSelectionMode(HbAbstractItemView::SingleSelection);
             listView->setSelectionModel(mSelectionModel);

--- a/usbuis/usbuinotif/src/usbnotifier.cpp	Fri Jul 23 13:40:58 2010 +0300
+++ b/usbuis/usbuinotif/src/usbnotifier.cpp	Mon Aug 09 09:08:10 2010 +0300
@@ -180,7 +180,7 @@
     {
     _LIT(KFileName, "usbdialogs_");
     _LIT(KPath, "z:/resource/qt/translations/");         
-    TInt error;
+    TInt error = KErrNone;
         
     iTranslator = (TBool )Dll::Tls();