[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/glomenu.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit d95d2a723ffa291c300fd6cae5530f145a7d47de
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 22 11:00:42 2016 +0100

    G_MENU_ATTRIBUTE_ICON is only in glib >= 2.38
    
    Change-Id: I7761ac05fbc9be39a6982ba66054c75a331816be
    (cherry picked from commit 8488b3ba00e23e8ae6e089f450965c93c7a13d26)

diff --git a/vcl/unx/gtk/glomenu.cxx b/vcl/unx/gtk/glomenu.cxx
index aab6857..f91a469 100644
--- a/vcl/unx/gtk/glomenu.cxx
+++ b/vcl/unx/gtk/glomenu.cxx
@@ -248,6 +248,10 @@ g_lo_menu_set_icon (GLOMenu     *menu,
     else
         value = nullptr;
 
+#ifndef G_MENU_ATTRIBUTE_ICON
+#    define G_MENU_ATTRIBUTE_ICON "icon"
+#endif
+
     g_lo_menu_set_attribute_value (menu, position, G_MENU_ATTRIBUTE_ICON, value);
 }