mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-27 08:47:22 +03:00
Merge pull request #1880 from nicolasfella/timeout
Remove timeout parameter from showMessage
This commit is contained in:
commit
ef42635c23
2 changed files with 3 additions and 3 deletions
|
@ -117,7 +117,7 @@ Q_INVOKABLE void Systray::setClosed()
|
|||
_isOpen = false;
|
||||
}
|
||||
|
||||
void Systray::showMessage(const QString &title, const QString &message, MessageIcon icon, int millisecondsTimeoutHint)
|
||||
void Systray::showMessage(const QString &title, const QString &message, MessageIcon icon)
|
||||
{
|
||||
#ifdef USE_FDO_NOTIFICATIONS
|
||||
if (QDBusInterface(NOTIFICATIONS_SERVICE, NOTIFICATIONS_PATH, NOTIFICATIONS_IFACE).isValid()) {
|
||||
|
@ -135,7 +135,7 @@ void Systray::showMessage(const QString &title, const QString &message, MessageI
|
|||
} else
|
||||
#endif
|
||||
{
|
||||
QSystemTrayIcon::showMessage(title, message, icon, millisecondsTimeoutHint);
|
||||
QSystemTrayIcon::showMessage(title, message, icon);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ public:
|
|||
virtual ~Systray() {};
|
||||
|
||||
void create();
|
||||
void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int millisecondsTimeoutHint = 10000);
|
||||
void showMessage(const QString &title, const QString &message, MessageIcon icon = Information);
|
||||
void setToolTip(const QString &tip);
|
||||
bool isOpen();
|
||||
|
||||
|
|
Loading…
Reference in a new issue