FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-31 09:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Beta version 1.9.20: Fix build without dbus.

Browse Source
This commit is contained in:
John Preston
2020-03-14 16:13:33 +04:00
parent 46445e0542
commit fec6a8dd96
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+18 -14
View File
@@ -411,6 +411,12 @@ void MainWindow::initHook() {
&QDBusServiceWatcher::serviceOwnerChanged,
this,
&MainWindow::onSNIOwnerChanged);
connect(
windowHandle(),
&QWindow::visibleChanged,
this,
&MainWindow::onVisibleChanged);
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
if (UseUnityCounter()) {
@@ -418,12 +424,6 @@ void MainWindow::initHook() {
} else {
LOG(("Not using Unity launcher counter."));
}
connect(
windowHandle(),
&QWindow::visibleChanged,
this,
&MainWindow::onVisibleChanged);
}
bool MainWindow::hasTrayIcon() const {
@@ -632,9 +632,7 @@ void MainWindow::updateIconCounters() {
signal << dbusUnityProperties;
QDBusConnection::sessionBus().send(signal);
}
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
if (_sniTrayIcon) {
setSNITrayIcon(counter, muted);
}
@@ -658,8 +656,17 @@ void MainWindow::initTrayMenuHook() {
_trayIconMenuXEmbed->deleteOnHide(false);
}
#ifdef TDESKTOP_DISABLE_DBUS_INTEGRATION
void MainWindow::createGlobalMenu() {
}
void MainWindow::updateGlobalMenuHook() {
}
#else // TDESKTOP_DISABLE_DBUS_INTEGRATION
void MainWindow::createGlobalMenu() {
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
if (!AppMenuSupported()) return;
psMainMenu = new QMenu(this);
@@ -843,7 +850,6 @@ void MainWindow::createGlobalMenu() {
RegisterAppMenu(winId(), _mainMenuPath);
updateGlobalMenu();
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
}
void MainWindow::psLinuxUndo() {
@@ -899,7 +905,6 @@ void MainWindow::psLinuxClearFormat() {
}
void MainWindow::updateGlobalMenuHook() {
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
if (!AppMenuSupported() || !App::wnd() || !positionInited()) return;
const auto focused = QApplication::focusWidget();
@@ -959,11 +964,9 @@ void MainWindow::updateGlobalMenuHook() {
ForceDisabled(psStrikeOut, !markdownEnabled);
ForceDisabled(psMonospace, !markdownEnabled);
ForceDisabled(psClearFormat, !markdownEnabled);
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
}
void MainWindow::onVisibleChanged(bool visible) {
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
if (AppMenuSupported() && !_mainMenuPath.path().isEmpty()) {
if (visible) {
RegisterAppMenu(winId(), _mainMenuPath);
@@ -971,9 +974,10 @@ void MainWindow::onVisibleChanged(bool visible) {
UnregisterAppMenu(winId());
}
}
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
}
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
MainWindow::~MainWindow() {
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
delete _sniTrayIcon;