vcl/unx/gtk/gtkinst.cxx | 4 +++- vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)
New commits: commit 5c81db553106fd7bb97b8fa74783cbab292d7db2 Author: Thorsten Behrens <[email protected]> Date: Thu Feb 15 14:01:01 2018 +0100 gtk3_kde5: advertise vcl plugin correctly in about dialog Change-Id: Icfe977f7f9750003d992d795cad8cd86d7055e59 Reviewed-on: https://gerrit.libreoffice.org/49813 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> (cherry picked from commit d1b3455cfb4fcd438f3f29d8c14bb0f04423b8ad) Reviewed-on: https://gerrit.libreoffice.org/49820 diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index ac3bdef63890..3c4246538569 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -190,7 +190,9 @@ void GtkInstance::EnsureInit() ImplSVData* pSVData = ImplGetSVData(); delete pSVData->maAppData.mpToolkitName; -#if GTK_CHECK_VERSION(3,0,0) +#ifdef GTK_TOOLKIT_NAME + pSVData->maAppData.mpToolkitName = new OUString(GTK_TOOLKIT_NAME); +#elif GTK_CHECK_VERSION(3,0,0) pSVData->maAppData.mpToolkitName = new OUString("gtk3"); #else pSVData->maAppData.mpToolkitName = new OUString("gtk2"); diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx index d3f797ce9234..e25ec8b0ec9f 100644 --- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx +++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +// make gtk3 plug advertise correctly as kde5 hybrid +#define GTK_TOOLKIT_NAME "gtk3_kde5" #include "../gtk3/gtk3gtkinst.cxx" #include "gtk3_kde5_filepicker.hxx" _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
