procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add possibility to build without dbus

This commit is contained in:
Ilya Fedin 2020-01-21 16:51:39 +04:00 committed by John Preston
parent b4fbff0b6c
commit 0480611bf8
6 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
View File

@ -7,7 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "platform/linux/linux_desktop_environment.h" #include "platform/linux/linux_desktop_environment.h"
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
#include <QDBusInterface> #include <QDBusInterface>
#endif
namespace Platform { namespace Platform {
namespace DesktopEnvironment { namespace DesktopEnvironment {
@ -117,11 +119,11 @@ bool TryQtTrayIcon() {
bool PreferAppIndicatorTrayIcon() { bool PreferAppIndicatorTrayIcon() {
return IsXFCE() || IsUnity() || IsUbuntu() || return IsXFCE() || IsUnity() || IsUbuntu() ||
(IsGnome() && QDBusInterface("org.kde.StatusNotifierWatcher", "/").isValid()); #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
} (IsGnome() && QDBusInterface("org.kde.StatusNotifierWatcher", "/").isValid());
#else
bool TryUnityCounter() { IsGnome();
return IsUnity() || IsPantheon() || IsUbuntu() || IsKDE5(); #endif
} }
} // namespace DesktopEnvironment } // namespace DesktopEnvironment

1
Telegram/SourceFiles/platform/linux/linux_desktop_environment.h
View File

@ -67,7 +67,6 @@ inline bool IsAwesome() {
bool TryQtTrayIcon(); bool TryQtTrayIcon();
bool PreferAppIndicatorTrayIcon(); bool PreferAppIndicatorTrayIcon();
bool TryUnityCounter();
} // namespace DesktopEnvironment } // namespace DesktopEnvironment
} // namespace Platform } // namespace Platform

10
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@ -19,7 +19,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "facades.h" #include "facades.h"
#include "app.h" #include "app.h"
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
#include <QtDBus> #include <QtDBus>
#endif
#include <QtWidgets/QMenu> #include <QtWidgets/QMenu>
#include <QtWidgets/QAction> #include <QtWidgets/QAction>
@ -43,7 +46,10 @@ bool _trayIconMuted = true;
int32 _trayIconCount = 0; int32 _trayIconCount = 0;
QImage _trayIconImageBack, _trayIconImage; QImage _trayIconImageBack, _trayIconImage;
QString _desktopFile; QString _desktopFile;
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
QString _dbusPath = "/"; QString _dbusPath = "/";
#endif
#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
void _trayIconPopup(GtkStatusIcon *status_icon, guint button, guint32 activate_time, gpointer popup_menu) { void _trayIconPopup(GtkStatusIcon *status_icon, guint button, guint32 activate_time, gpointer popup_menu) {
@ -341,6 +347,7 @@ void MainWindow::updateIconCounters() {
const auto counter = Core::App().unreadBadge(); const auto counter = Core::App().unreadBadge();
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
if (useUnityCount) { if (useUnityCount) {
QVariantMap dbusUnityProperties; QVariantMap dbusUnityProperties;
if (counter > 0) { if (counter > 0) {
@ -355,6 +362,7 @@ void MainWindow::updateIconCounters() {
signal << dbusUnityProperties; signal << dbusUnityProperties;
QDBusConnection::sessionBus().send(signal); QDBusConnection::sessionBus().send(signal);
} }
#endif
if (noQtTrayIcon) { if (noQtTrayIcon) {
#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
@ -544,6 +552,7 @@ void MainWindow::psCreateTrayIcon() {
void MainWindow::psFirstShow() { void MainWindow::psFirstShow() {
psCreateTrayIcon(); psCreateTrayIcon();
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
if (QDBusInterface("com.canonical.Unity", "/").isValid()) { if (QDBusInterface("com.canonical.Unity", "/").isValid()) {
auto snapName = QString::fromLatin1(qgetenv("SNAP_NAME")); auto snapName = QString::fromLatin1(qgetenv("SNAP_NAME"));
if(snapName.isEmpty()) { if(snapName.isEmpty()) {
@ -572,6 +581,7 @@ void MainWindow::psFirstShow() {
} else { } else {
LOG(("Not using Unity Launcher count.")); LOG(("Not using Unity Launcher count."));
} }
#endif
bool showShadows = true; bool showShadows = true;

14
Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
View File

@ -12,12 +12,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "facades.h" #include "facades.h"
#include <QtCore/QBuffer> #include <QtCore/QBuffer>
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
#include <QtDBus/QDBusConnection> #include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusReply> #include <QtDBus/QDBusReply>
#include <QtDBus/QDBusMetaType> #include <QtDBus/QDBusMetaType>
#endif
namespace Platform { namespace Platform {
namespace Notifications { namespace Notifications {
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
namespace { namespace {
constexpr auto kService = str_const("org.freedesktop.Notifications"); constexpr auto kService = str_const("org.freedesktop.Notifications");
@ -276,24 +281,32 @@ const QDBusArgument &operator>>(const QDBusArgument &argument,
argument.endStructure(); argument.endStructure();
return argument; return argument;
} }
#endif
bool Supported() { bool Supported() {
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
static auto Available = QDBusInterface( static auto Available = QDBusInterface(
str_const_toString(kService), str_const_toString(kService),
str_const_toString(kObjectPath), str_const_toString(kObjectPath),
str_const_toString(kInterface)).isValid(); str_const_toString(kInterface)).isValid();
return Available; return Available;
#else
return false;
#endif
} }
std::unique_ptr<Window::Notifications::Manager> Create( std::unique_ptr<Window::Notifications::Manager> Create(
Window::Notifications::System *system) { Window::Notifications::System *system) {
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
if (Global::NativeNotifications() && Supported()) { if (Global::NativeNotifications() && Supported()) {
return std::make_unique<Manager>(system); return std::make_unique<Manager>(system);
} }
#endif
return nullptr; return nullptr;
} }
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
Manager::Private::Private(Manager *manager, Type type) Manager::Private::Private(Manager *manager, Type type)
: _cachedUserpics(type) : _cachedUserpics(type)
, _manager(manager) , _manager(manager)
@ -435,6 +448,7 @@ void Manager::doClearAllFast() {
void Manager::doClearFromHistory(not_null<History*> history) { void Manager::doClearFromHistory(not_null<History*> history) {
_private->clearFromHistory(history); _private->clearFromHistory(history);
} }
#endif
} // namespace Notifications } // namespace Notifications
} // namespace Platform } // namespace Platform

6
Telegram/SourceFiles/platform/linux/notifications_manager_linux.h
View File

@ -11,8 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/notifications_utilities.h" #include "window/notifications_utilities.h"
#include "base/weak_ptr.h" #include "base/weak_ptr.h"
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
#include <QtDBus/QDBusInterface> #include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusArgument> #include <QtDBus/QDBusArgument>
#endif
namespace Platform { namespace Platform {
namespace Notifications { namespace Notifications {
@ -28,6 +30,7 @@ inline bool SkipToast() {
inline void FlashBounce() { inline void FlashBounce() {
} }
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
class NotificationData : public QObject { class NotificationData : public QObject {
Q_OBJECT Q_OBJECT
@ -134,8 +137,11 @@ private:
base::weak_ptr<Manager> _manager; base::weak_ptr<Manager> _manager;
std::shared_ptr<QDBusInterface> _notificationInterface; std::shared_ptr<QDBusInterface> _notificationInterface;
}; };
#endif
} // namespace Notifications } // namespace Notifications
} // namespace Platform } // namespace Platform
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
Q_DECLARE_METATYPE(Platform::Notifications::NotificationData::ImageData) Q_DECLARE_METATYPE(Platform::Notifications::NotificationData::ImageData)
#endif

5
Telegram/cmake/telegram_options.cmake
View File

@ -9,6 +9,7 @@ option(TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME "Disable automatic 'tg://' URL sc
option(TDESKTOP_DISABLE_NETWORK_PROXY "Disable all code for working through Socks5 or MTProxy." OFF) option(TDESKTOP_DISABLE_NETWORK_PROXY "Disable all code for working through Socks5 or MTProxy." OFF)
option(TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION "Disable automatic '.desktop' file generation (Linux only)." OFF) option(TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION "Disable automatic '.desktop' file generation (Linux only)." OFF)
option(TDESKTOP_DISABLE_GTK_INTEGRATION "Disable all code for GTK integration (Linux only)." OFF) option(TDESKTOP_DISABLE_GTK_INTEGRATION "Disable all code for GTK integration (Linux only)." OFF)
option(TDESKTOP_DISABLE_DBUS_INTEGRATION "Disable all code for D-Bus integration (Linux only)." OFF)
option(TDESKTOP_USE_PACKAGED_TGVOIP "Find libtgvoip using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED}) option(TDESKTOP_USE_PACKAGED_TGVOIP "Find libtgvoip using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
option(TDESKTOP_API_TEST "Use test API credentials." OFF) option(TDESKTOP_API_TEST "Use test API credentials." OFF)
set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.")
@ -85,6 +86,10 @@ if (TDESKTOP_DISABLE_GTK_INTEGRATION)
target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_GTK_INTEGRATION) target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_GTK_INTEGRATION)
endif() endif()
if (TDESKTOP_DISABLE_DBUS_INTEGRATION)
target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_DBUS_INTEGRATION)
endif()
if (NOT TDESKTOP_LAUNCHER_BASENAME) if (NOT TDESKTOP_LAUNCHER_BASENAME)
if (NOT DESKTOP_APP_USE_PACKAGED) if (NOT DESKTOP_APP_USE_PACKAGED)
set(TDESKTOP_LAUNCHER_BASENAME "telegramdesktop") set(TDESKTOP_LAUNCHER_BASENAME "telegramdesktop")