mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Fixed travis build for TDESKTOP_DISABLE_AUTOUPDATE case.

Browse Source
This commit is contained in:
John Preston
2016-10-18 10:56:38 +03:00
parent 086f754a96
commit fc7c5d0ab3
31 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/platform/linux/linux_libs.cpp
View File

@@ -209,7 +209,7 @@ f_g_slist_free g_slist_free = nullptr;
f_unity_launcher_entry_set_count unity_launcher_entry_set_count = nullptr;
f_unity_launcher_entry_set_count_visible unity_launcher_entry_set_count_visible = nullptr;
f_unity_launcher_entry_get_for_desktop_id unity_launcher_entry_get_for_desktop_id = nullptr;
#endif // TDESKTOP_DISABLE_UNITY_INTEGRATION
#endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
void start() {
DEBUG_LOG(("Loading libraries"));
@@ -279,7 +279,7 @@ void start() {
load(lib_unity, "unity_launcher_entry_set_count", unity_launcher_entry_set_count);
load(lib_unity, "unity_launcher_entry_set_count_visible", unity_launcher_entry_set_count_visible);
}
#endif // TDESKTOP_DISABLE_UNITY_INTEGRATION
#endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
if (gtkLoaded) {
startLibNotify();

4
Telegram/SourceFiles/platform/linux/linux_libs.h
View File

@@ -30,7 +30,7 @@ extern "C" {
#ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
#include <unity/unity/unity.h>
#endif // TDESKTOP_DISABLE_UNITY_INTEGRATION
#endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
namespace Platform {
namespace Libs {
@@ -351,7 +351,7 @@ extern f_unity_launcher_entry_set_count_visible unity_launcher_entry_set_count_v
typedef UnityLauncherEntry* (*f_unity_launcher_entry_get_for_desktop_id)(const gchar* desktop_id);
extern f_unity_launcher_entry_get_for_desktop_id unity_launcher_entry_get_for_desktop_id;
#endif // TDESKTOP_DISABLE_UNITY_INTEGRATION
#endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
} // namespace Libs
} // namespace Platform

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

@@ -173,7 +173,7 @@ static gboolean _trayIconCheck(gpointer/* pIn*/) {
#ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
UnityLauncherEntry *_psUnityLauncherEntry = nullptr;
#endif // TDESKTOP_DISABLE_UNITY_INTEGRATION
#endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
} // namespace
@@ -326,7 +326,7 @@ void MainWindow::psUpdateCounter() {
Libs::unity_launcher_entry_set_count_visible(_psUnityLauncherEntry, FALSE);
}
}
#endif // TDESKTOP_DISABLE_UNITY_INTEGRATION
#endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
if (noQtTrayIcon) {
if (useAppIndicator) {
@@ -427,7 +427,7 @@ void MainWindow::LibsLoaded() {
if (useUnityCount) {
DEBUG_LOG(("Unity count api loaded!"));
}
#endif // TDESKTOP_DISABLE_UNITY_INTEGRATION
#endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
}
void MainWindow::psInitSize() {
@@ -617,7 +617,7 @@ void MainWindow::psFirstShow() {
} else {
LOG(("Not using Unity Launcher count."));
}
#endif // TDESKTOP_DISABLE_UNITY_INTEGRATION
#endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
psUpdateMargins();