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

disabled gtk and appindicator unload

This commit is contained in:
John Preston 2015-01-28 16:18:46 +03:00
parent 75a47e98c3
commit fd4ecd08e9
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Telegram/SourceFiles/pspecific_linux.cpp
View File

@ -325,21 +325,26 @@ namespace {
class _PsInitializer { class _PsInitializer {
public: public:
_PsInitializer() { _PsInitializer() {
std::cout << "libs init..\n";
setupGtk(); setupGtk();
setupUnity(); setupUnity();
} }
bool loadLibrary(QLibrary &lib, const char *name, int version) { bool loadLibrary(QLibrary &lib, const char *name, int version) {
std::cout << "loading " << name << " with version " << version << "..\n";
lib.setFileNameAndVersion(QLatin1String(name), version); lib.setFileNameAndVersion(QLatin1String(name), version);
if (lib.load()) { if (lib.load()) {
std::cout << "loaded " << name << " with version " << version << "!\n";
_initLogs.push_back(QString("Loaded '%1' version %2 library").arg(name).arg(version)); _initLogs.push_back(QString("Loaded '%1' version %2 library").arg(name).arg(version));
return true; return true;
} }
lib.setFileNameAndVersion(QLatin1String(name), QString()); lib.setFileNameAndVersion(QLatin1String(name), QString());
if (lib.load()) { if (lib.load()) {
std::cout << "loaded " << name << " without version!\n";
_initLogs.push_back(QString("Loaded '%1' without version library").arg(name)); _initLogs.push_back(QString("Loaded '%1' without version library").arg(name));
return true; return true;
} }
std::cout << "could not load " << name << " without version.\n";
return false; return false;
} }
@ -361,6 +366,7 @@ namespace {
if (!loadFunction(lib_gtk, "g_signal_connect_data", ps_g_signal_connect_data)) return; if (!loadFunction(lib_gtk, "g_signal_connect_data", ps_g_signal_connect_data)) return;
useGtkBase = true; useGtkBase = true;
std::cout << "loaded gtk funcs!\n";
} }
void setupAppIndicator(QLibrary &lib_indicator) { void setupAppIndicator(QLibrary &lib_indicator) {
@ -369,30 +375,34 @@ namespace {
if (!loadFunction(lib_indicator, "app_indicator_set_menu", ps_app_indicator_set_menu)) return; if (!loadFunction(lib_indicator, "app_indicator_set_menu", ps_app_indicator_set_menu)) return;
if (!loadFunction(lib_indicator, "app_indicator_set_icon_full", ps_app_indicator_set_icon_full)) return; if (!loadFunction(lib_indicator, "app_indicator_set_icon_full", ps_app_indicator_set_icon_full)) return;
useAppIndicator = true; useAppIndicator = true;
std::cout << "loaded appindicator funcs!\n";
} }
void setupGtk() { void setupGtk() {
QLibrary lib_gtk, lib_indicator; QLibrary lib_gtk, lib_indicator;
if (loadLibrary(lib_gtk, "gtk-3", 0)) { if (loadLibrary(lib_indicator, "appindicator3", 1)) {
if (loadLibrary(lib_indicator, "appindicator3", 1)) { if (loadLibrary(lib_gtk, "gtk-3", 0)) {
setupGtkBase(lib_gtk); setupGtkBase(lib_gtk);
setupAppIndicator(lib_indicator); setupAppIndicator(lib_indicator);
} }
} }
if (!useGtkBase || !useAppIndicator) { if (!useGtkBase || !useAppIndicator) {
if (lib_gtk.isLoaded()) lib_gtk.unload(); if (loadLibrary(lib_indicator, "appindicator", 1)) {
if (lib_indicator.isLoaded()) lib_indicator.unload(); if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
if (loadLibrary(lib_indicator, "appindicator", 1)) {
useGtkBase = useAppIndicator = false; useGtkBase = useAppIndicator = false;
setupGtkBase(lib_gtk); setupGtkBase(lib_gtk);
setupAppIndicator(lib_indicator); setupAppIndicator(lib_indicator);
} }
} }
} }
if (!useGtkBase && lib_gtk.isLoaded()) {
std::cout << "no appindicator, trying to load gtk..\n";
setupGtkBase(lib_gtk);
}
if (!useGtkBase) { if (!useGtkBase) {
useAppIndicator = false; useAppIndicator = false;
_initLogs.push_back(QString("Init Error: Failed to load 'gtk-x11-2.0' library!")); _initLogs.push_back(QString("Init Error: Failed to load 'gtk-x11-2.0' library!"));
std::cout << "no appindicator :(\n";
return; return;
} }
@ -412,6 +422,7 @@ namespace {
if (!loadFunction(lib_gtk, "g_object_unref", ps_g_object_unref)) return; if (!loadFunction(lib_gtk, "g_object_unref", ps_g_object_unref)) return;
if (!loadFunction(lib_gtk, "g_idle_add", ps_g_idle_add)) return; if (!loadFunction(lib_gtk, "g_idle_add", ps_g_idle_add)) return;
useStatusIcon = true; useStatusIcon = true;
std::cout << "status icon api loaded\n";
} }
void setupUnity() { void setupUnity() {
@ -422,6 +433,7 @@ namespace {
if (!loadFunction(lib_unity, "unity_launcher_entry_set_count", ps_unity_launcher_entry_set_count)) return; if (!loadFunction(lib_unity, "unity_launcher_entry_set_count", ps_unity_launcher_entry_set_count)) return;
if (!loadFunction(lib_unity, "unity_launcher_entry_set_count_visible", ps_unity_launcher_entry_set_count_visible)) return; if (!loadFunction(lib_unity, "unity_launcher_entry_set_count_visible", ps_unity_launcher_entry_set_count_visible)) return;
useUnityCount = true; useUnityCount = true;
std::cout << "unity count api loaded\n";
} }
}; };
_PsInitializer _psInitializer; _PsInitializer _psInitializer;