mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-05 00:55:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into mentions

Browse Source 
Conflicts:
	Telegram/SourceFiles/core/basic_types.h
This commit is contained in:
John Preston
2016-05-04 13:45:23 +03:00
parent 5f440a0cbe 5f5109f1c4
commit 5300962ef3
10 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/pspecific_mac.cpp
View File

@@ -122,7 +122,7 @@ void PsMainWindow::psSetupTrayIcon() {
icon.addPixmap(QPixmap::fromImage(psTrayIcon(true), Qt::ColorOnly), QIcon::Selected);
trayIcon->setIcon(icon);
trayIcon->setToolTip(QString::fromStdWString(AppName));
trayIcon->setToolTip(str_const_toString(AppName));
connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleTray(QSystemTrayIcon::ActivationReason)), Qt::UniqueConnection);
App::wnd()->updateTrayMenu();
}