From c216a888be258655a8233bcc052f319d28b5a691 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 Sep 2014 07:45:47 -0700
Subject: [PATCH] 0.6 version prepared for linux build
---
Telegram/SourceFiles/window.cpp | 2 +-
Telegram/Telegram.pro | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp
index ebfa61b2b..3fba77e11 100644
--- a/Telegram/SourceFiles/window.cpp
+++ b/Telegram/SourceFiles/window.cpp
@@ -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);
diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro
index a2864fa5a..967c3e1df 100644
--- a/Telegram/Telegram.pro
+++ b/Telegram/Telegram.pro
@@ -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 \