Showing with 6 additions and 3 deletions.

+1 −1 python/pyplugin_installer/qgsplugininstallerinstallingdialog.py

+1 −1 src/app/pluginmanager/qgspluginsortfilterproxymodel.cpp

+4 −1 src/core/qgsnetworkaccessmanager.cpp
diff --git a/python/pyplugin_installer/qgsplugininstallerinstallingdialog.py b/python/pyplugin_installer/qgsplugininstallerinstallingdialog.py
@@ -84,7 +84,7 @@ def requestFinished(self):
     reply = self.sender()
     self.buttonBox.setEnabled(False)
     if reply.error() != QNetworkReply.NoError:
-      self.mResult = self.http.errorString()
+      self.mResult = reply.errorString()
       self.reject()
       del reply
       return

diff --git a/src/app/pluginmanager/qgspluginsortfilterproxymodel.cpp b/src/app/pluginmanager/qgspluginsortfilterproxymodel.cpp
@@ -87,7 +87,7 @@ int QgsPluginSortFilterProxyModel::countWithCurrentStatus( )
   for ( int i = 0; i < sourceModel()->rowCount(); ++i )
   {
     QModelIndex idx = sourceModel()->index( i, 0 );
-    if ( filterByStatus( idx ) )
+    if ( filterByStatus( idx ) && sourceModel()->data( idx, SPACER_ROLE ).toString().isEmpty() )
     {
       result++ ;
     }

diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp
@@ -132,8 +132,11 @@ QNetworkReply *QgsNetworkAccessManager::createRequest( QNetworkAccessManager::Op
   emit requestCreated( reply );
 
   // abort request, when network timeout happens
+  QTimer *timer = new QTimer( reply );
+  connect( timer, SIGNAL( timeout() ), this, SLOT( abortRequest() ) );
   QSettings s;
-  QTimer::singleShot( s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt(), this, SLOT( abortRequested() ) );
+  timer->setSingleShot( true );
+  timer->start( s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt() );
 
   return reply;
 }