Build fixed for Linux, checking for compositing manager running.

Backported QX11Info::isCompositingManagerRunning from Qt 5.7.
This commit is contained in:
John Preston
2016-11-11 10:51:53 +03:00
parent 27ff8d4bf5
commit bd2be4e0c1
9 changed files with 102 additions and 18 deletions
@@ -61,7 +61,7 @@ void _trayIconActivate(GtkStatusIcon *status_icon, gpointer popup_menu) {
gboolean _trayIconResized(GtkStatusIcon *status_icon, gint size, gpointer popup_menu) {
_trayIconSize = size;
if (App::wnd()) App::wnd()->psUpdateCounter();
if (Global::started()) Notify::unreadCounterUpdated();
return FALSE;
}
@@ -166,7 +166,7 @@ static gboolean _trayIconCheck(gpointer/* pIn*/) {
cSetSupportTray(true);
if (App::wnd()) {
App::wnd()->psUpdateWorkmode();
App::wnd()->psUpdateCounter();
Notify::unreadCounterUpdated();
App::wnd()->updateTrayMenu();
}
}
@@ -239,7 +239,7 @@ void MainWindow::psTrayMenuUpdated() {
void MainWindow::psSetupTrayIcon() {
if (noQtTrayIcon) {
if (!cSupportTray()) return;
psUpdateCounter();
updateIconCounters();
} else {
LOG(("Using Qt tray icon."));
if (!trayIcon) {
@@ -266,7 +266,7 @@ void MainWindow::psSetupTrayIcon() {
App::wnd()->updateTrayMenu();
}
psUpdateCounter();
updateIconCounters();
trayIcon->show();
}
@@ -315,12 +315,16 @@ void MainWindow::psUpdateIndicator() {
}
}
void MainWindow::psUpdateCounter() {
void MainWindow::unreadCounterChangedHook() {
setWindowTitle(titleText());
updateIconCounters();
}
void MainWindow::updateIconCounters() {
setWindowIcon(wndIcon);
int32 counter = App::histories().unreadBadge();
setWindowTitle((counter > 0) ? qsl("Telegram (%1)").arg(counter) : qsl("Telegram"));
#ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
if (_psUnityLauncherEntry) {
if (counter > 0) {