diff options
Diffstat (limited to 'net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp')
-rw-r--r-- | net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp deleted file mode 100644 index 969af7d44905..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp +++ /dev/null @@ -1,87 +0,0 @@ ---- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-10-07 15:58:21 UTC -+++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp -@@ -30,7 +30,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false; - bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false; - - #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION -+#ifdef HAVE_APPINDICATOR - AppIndicator *_trayIndicator = 0; -+#endif - GtkStatusIcon *_trayIcon = 0; - GtkWidget *_trayMenu = 0; - GdkPixbuf *_trayPixbuf = 0; -@@ -296,7 +298,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { - if (noQtTrayIcon) { - #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION - if (useAppIndicator) { -+#ifdef HAVE_APPINDICATOR - Libs::app_indicator_set_status(_trayIndicator, APP_INDICATOR_STATUS_PASSIVE); -+#endif - } else if (useStatusIcon) { - Libs::gtk_status_icon_set_visible(_trayIcon, false); - } -@@ -312,7 +316,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { - if (noQtTrayIcon) { - #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION - if (useAppIndicator) { -+#ifdef HAVE_APPINDICATOR - Libs::app_indicator_set_status(_trayIndicator, APP_INDICATOR_STATUS_ACTIVE); -+#endif - } else if (useStatusIcon) { - Libs::gtk_status_icon_set_visible(_trayIcon, true); - } -@@ -331,7 +337,9 @@ void MainWindow::psUpdateIndicator() { - if (iconFile.exists()) { - QByteArray path = QFile::encodeName(iconFile.absoluteFilePath()), name = QFile::encodeName(iconFile.fileName()); - name = name.mid(0, name.size() - 4); -+#ifdef HAVE_APPINDICATOR - Libs::app_indicator_set_icon_full(_trayIndicator, path.constData(), name); -+#endif - } else { - useAppIndicator = false; - } -@@ -428,11 +436,15 @@ void MainWindow::LibsLoaded() { - && (Libs::g_object_ref_sink != nullptr) - && (Libs::g_object_unref != nullptr); - -+#ifdef HAVE_APPINDICATOR - useAppIndicator = useGtkBase - && (Libs::app_indicator_new != nullptr) - && (Libs::app_indicator_set_status != nullptr) - && (Libs::app_indicator_set_menu != nullptr) - && (Libs::app_indicator_set_icon_full != nullptr); -+#else -+ useAppIndicator = false; -+#endif - - if (tryAppIndicator && useGtkBase && useAppIndicator) { - noQtTrayIcon = true; -@@ -468,6 +480,7 @@ void MainWindow::psCreateTrayIcon() { - } - - #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION -+#ifdef HAVE_APPINDICATOR - if (useAppIndicator) { - DEBUG_LOG(("Trying to create AppIndicator")); - _trayMenu = Libs::gtk_menu_new(); -@@ -498,6 +511,7 @@ void MainWindow::psCreateTrayIcon() { - useAppIndicator = false; - } - } -+#endif - if (useStatusIcon) { - if (Libs::gdk_init_check(0, 0)) { - if (!_trayMenu) _trayMenu = Libs::gtk_menu_new(); -@@ -632,10 +646,12 @@ MainWindow::~MainWindow() { - Libs::g_object_unref(_trayMenu); - _trayMenu = nullptr; - } -+#ifdef HAVE_APPINDICATOR - if (_trayIndicator) { - Libs::g_object_unref(_trayIndicator); - _trayIndicator = nullptr; - } -+#endif - #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION - } - |