MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

Browse Source
This commit is contained in:
John Preston 2014-09-30 11:33:08 -07:00
commit 2c03abaa8e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/window.cpp
View File

@ -787,7 +787,7 @@ void Window::setupTrayIcon() {
}
void Window::updateTrayMenu(bool force) {
if (!trayIconMenu || (cPlatform() == dbipWindows && !force)) return;
if (!trayIconMenu || (cPlatform() == dbipWindows && !force) || cPlatform() == dbipLinux32 || cPlatform() == dbipLinux64) return;
bool active = psIsActive();
QAction *first = trayIconMenu->actions().at(0);

2
Telegram/Telegram.pro
View File

@ -111,6 +111,7 @@ SOURCES += \
./SourceFiles/gui/animation.cpp \
./SourceFiles/gui/boxshadow.cpp \
./SourceFiles/gui/button.cpp \
./SourceFiles/gui/contextmenu.cpp \
./SourceFiles/gui/countrycodeinput.cpp \
./SourceFiles/gui/countryinput.cpp \
./SourceFiles/gui/emoji_config.cpp \
@ -189,6 +190,7 @@ HEADERS += \
./SourceFiles/gui/animation.h \
./SourceFiles/gui/boxshadow.h \
./SourceFiles/gui/button.h \
./SourceFiles/gui/contextmenu.h \
./SourceFiles/gui/countrycodeinput.h \
./SourceFiles/gui/countryinput.h \
./SourceFiles/gui/emoji_config.h \