diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-23 14:13:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-23 14:15:48 +0000 |
| commit | 6903066822900a700ccf67ae70fa171c94644a9a (patch) | |
| tree | dbea0ec9c8dd295a9d60f6d73ecf8be8c0d3a5cd | |
| parent | 42870930e2a625766288edc3ba956c1bcac198f0 (diff) | |
Related: rhbz#1334915 tdf#100158 hack using startcenter icon under wayland
cause I can get no traction with gnome#779143 to allow changing wayland
app_ids for windows, so might as well bodge something to make us look
less pathetic than the broken app icon
Change-Id: I9810ba4908dd06a2fdbb2e58e7ad6ff4978ddd43
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index a06294b94940..a1dae1594c93 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1447,7 +1447,23 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ ) m_pParent->addGrabLevel(); } +#if defined(GDK_WINDOWING_WAYLAND) + //rhbz#1334915, gnome#779143, tdf#100158 + //gtk under wayland lacks a way to change the app_id + //of a window, so brute force everything as a + //startcenter when initially shown to at least get + //the default LibreOffice icon and not the broken + //app icon + if (GDK_IS_WAYLAND_DISPLAY(getGdkDisplay())) + { + OString sOrigName(g_get_prgname()); + g_set_prgname("libreoffice-startcenter"); + gtk_widget_show(m_pWindow); + g_set_prgname(sOrigName.getStr()); + } +#else gtk_widget_show(m_pWindow); +#endif if( isFloatGrabWindow() ) { |