[Libreoffice-commits] core.git: vcl/unx

[Julien Nabet]

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit c301d8c8fa1de36d8aae03cfa76772b537b10980
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Jun 24 22:41:31 2015 +0200

    GtkSettings:gtk-menu-images deprecated
    
    Not sure here if we should set true or false by default
    
    Change-Id: I120c33bf726150506d282e972facd4dca0db83aa
    Reviewed-on: https://gerrit.libreoffice.org/16456
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index f641f53..98ad9b1 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1740,12 +1740,11 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     aMouseSettings.SetMenuDelay( MENU_POPUP_DELAY );
     rSettings.SetMouseSettings( aMouseSettings );
 
-    gboolean showmenuicons = true, primarybuttonwarps = false;
+    gboolean primarybuttonwarps = false;
     g_object_get( pSettings,
-        "gtk-menu-images", &showmenuicons,
         "gtk-primary-button-warps-slider", &primarybuttonwarps,
         nullptr );
-    aStyleSet.SetPreferredUseImagesInMenus(showmenuicons);
+    aStyleSet.SetPreferredUseImagesInMenus(false);
     aStyleSet.SetPrimaryButtonWarpsSlider(primarybuttonwarps);
 
     // set scrollbar settings