mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-24 05:55:59 +03:00
Use showTrayMessage instead of _tray directly
This commit is contained in:
parent
4bbb29c2b4
commit
2ef62524d6
1 changed files with 6 additions and 3 deletions
|
@ -282,7 +282,7 @@ void Application::slotFetchCredentials()
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !trayMessage.isEmpty() ) {
|
if( !trayMessage.isEmpty() ) {
|
||||||
_tray->showMessage(tr("Credentials"), trayMessage);
|
slotShowTrayMessage(tr("Credentials"), trayMessage);
|
||||||
_actionOpenStatus->setEnabled( false );
|
_actionOpenStatus->setEnabled( false );
|
||||||
_actionAddFolder->setEnabled( false );
|
_actionAddFolder->setEnabled( false );
|
||||||
}
|
}
|
||||||
|
@ -302,7 +302,7 @@ void Application::slotCredentialsFetched(bool ok)
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !trayMessage.isEmpty() ) {
|
if( !trayMessage.isEmpty() ) {
|
||||||
_tray->showMessage(tr("Credentials"), trayMessage);
|
slotShowTrayMessage(tr("Credentials"), trayMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
qDebug() << "Could not fetch credentials";
|
qDebug() << "Could not fetch credentials";
|
||||||
|
@ -953,7 +953,10 @@ void Application::slotParseOptions(const QString &opts)
|
||||||
|
|
||||||
void Application::slotShowTrayMessage(const QString &title, const QString &msg)
|
void Application::slotShowTrayMessage(const QString &title, const QString &msg)
|
||||||
{
|
{
|
||||||
_tray->showMessage(title, msg);
|
if( _tray != NULL )
|
||||||
|
_tray->showMessage(title, msg);
|
||||||
|
else
|
||||||
|
qDebug() << "Tray not ready: " << msg;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::slotSyncStateChange( const QString& alias )
|
void Application::slotSyncStateChange( const QString& alias )
|
||||||
|
|
Loading…
Reference in a new issue