Differential D13434 Diff 36441 net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp
Changeset View
Changeset View
Standalone View
Standalone View
net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp
- This file was added.
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2017-09-05 17:38:38 UTC | |||||
| +++ Telegram/SourceFiles/platform/linux/linux_libs.cpp | |||||
| @@ -133,6 +133,7 @@ bool setupGtkBase(QLibrary &lib_gtk) { | |||||
| return true; | |||||
| } | |||||
| +#ifdef HAVE_APPINDICATOR | |||||
| bool setupAppIndicator(QLibrary &lib_indicator) { | |||||
| if (!load(lib_indicator, "app_indicator_new", app_indicator_new)) return false; | |||||
| if (!load(lib_indicator, "app_indicator_set_status", app_indicator_set_status)) return false; | |||||
| @@ -142,6 +143,7 @@ bool setupAppIndicator(QLibrary &lib_ind | |||||
| DEBUG_LOG(("Library appindicator functions loaded!")); | |||||
| return true; | |||||
| } | |||||
| +#endif | |||||
| } // namespace | |||||
| @@ -201,10 +203,12 @@ f_g_type_check_instance_cast g_type_chec | |||||
| f_g_type_check_instance_is_a g_type_check_instance_is_a = nullptr; | |||||
| f_g_signal_connect_data g_signal_connect_data = nullptr; | |||||
| f_g_signal_handler_disconnect g_signal_handler_disconnect = nullptr; | |||||
| +#ifdef HAVE_APPINDICATOR | |||||
| f_app_indicator_new app_indicator_new = nullptr; | |||||
| f_app_indicator_set_status app_indicator_set_status = nullptr; | |||||
| f_app_indicator_set_menu app_indicator_set_menu = nullptr; | |||||
| f_app_indicator_set_icon_full app_indicator_set_icon_full = nullptr; | |||||
| +#endif | |||||
| f_gdk_init_check gdk_init_check = nullptr; | |||||
| f_gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data = nullptr; | |||||
| f_gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file = nullptr; | |||||
| @@ -242,6 +246,7 @@ void start() { | |||||
| bool gtkLoaded = false; | |||||
| bool indicatorLoaded = false; | |||||
| QLibrary lib_gtk, lib_indicator; | |||||
| +#ifdef HAVE_APPINDICATOR | |||||
| if (loadLibrary(lib_indicator, "appindicator3", 1)) { | |||||
| if (loadLibrary(lib_gtk, "gtk-3", 0)) { | |||||
| gtkLoaded = setupGtkBase(lib_gtk); | |||||
| @@ -257,6 +262,7 @@ void start() { | |||||
| } | |||||
| } | |||||
| } | |||||
| +#endif | |||||
| // If no appindicator, try at least load gtk. | |||||
| if (!gtkLoaded && !indicatorLoaded) { | |||||