Log timeout URL to message log, only display short message in message bar

manisandro · manisandro · commit d2dce59cf064 · 2014-04-09T18:00:25.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9385,7 +9385,8 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors
 
 void QgisApp::namRequestTimedOut( QNetworkReply *reply )
 {
-  messageBar()->pushMessage( tr( "Network request timeout" ), tr( "The request '%1' timed out. Any data received is likely incomplete." ).arg( reply->url().toString() ), QgsMessageBar::WARNING, messageTimeout() );
+  QgsMessageLog::logMessage( tr( "The request '%1' timed out. Any data received is likely incomplete." ).arg( reply->url().toString() ), QString::null, QgsMessageLog::WARNING );
+  messageBar()->pushMessage( tr( "Network request timeout" ), tr( "A network request timed out, any data received is likely incomplete." ), QgsMessageBar::WARNING, messageTimeout() );
 }
 
 void QgisApp::namUpdate()

Original file line number	Diff line number	Diff line change
`@@ -9385,7 +9385,8 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors`
`9385`	`9385`
`9386`	`9386`	`void QgisApp::namRequestTimedOut( QNetworkReply *reply )`
`9387`	`9387`	`{`
`9388`		`- messageBar()->pushMessage( tr( "Network request timeout" ), tr( "The request '%1' timed out. Any data received is likely incomplete." ).arg( reply->url().toString() ), QgsMessageBar::WARNING, messageTimeout() );`
	`9388`	`+ QgsMessageLog::logMessage( tr( "The request '%1' timed out. Any data received is likely incomplete." ).arg( reply->url().toString() ), QString::null, QgsMessageLog::WARNING );`
	`9389`	`+ messageBar()->pushMessage( tr( "Network request timeout" ), tr( "A network request timed out, any data received is likely incomplete." ), QgsMessageBar::WARNING, messageTimeout() );`
`9389`	`9390`	`}`
`9390`	`9391`
`9391`	`9392`	`void QgisApp::namUpdate()`